Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: explicitly specify bundled or file system #939

Merged
merged 2 commits into from
Jun 11, 2019
Merged

feat: explicitly specify bundled or file system #939

merged 2 commits into from
Jun 11, 2019

Conversation

doitian
Copy link
Member

@doitian doitian commented Jun 3, 2019 •
edited
Loading

Eliminate ambiguity and simplify code.

BREAKING CHANGE:

config ckb.toml and ckb-miner.toml

- spec = "specs/dev.toml"
+ spec = { file = "specs/dev.toml" }

chain spec

[genesis.system_cells]
files = [
-   "specs/cells/secp256k1_blake160_sighash_all"
+   { bundled = "specs/cells/secp256k1_blake160_sighash_all" }
]

@doitian doitian requested a review from a team June 3, 2019 16:21
@nervos-bot nervos-bot bot assigned jjyr Jun 3, 2019
@nervos-bot
Copy link

nervos-bot bot commented Jun 3, 2019

@jjyr is assigned as the chief reviewer

@doitian doitian requested a review from xxuejie June 3, 2019 16:22
@doitian
Copy link
Member Author

doitian commented Jun 3, 2019

@nervos-bot ci-status 97668e0

CI: success ✅
Integration: success ✅

@doitian doitian added the b:cli Break cli options and config file label Jun 3, 2019
@nervos-bot nervos-bot bot added the breaking change The feature breaks consensus, database, message schema or RPC interface. label Jun 3, 2019
jjyr
jjyr reviewed Jun 4, 2019
View reviewed changes
resource/ckb.toml
# testnet => spec = "specs/testnet.toml"
# integration => spec = "specs/integration.toml"
# - { file = "specs/dev.toml" }
# - { bundled = "specs/testnet.toml" }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bundled is hard to understand in config, can we use some intention related name like builtin.

quake
quake requested changes Jun 8, 2019
View reviewed changes
resource/src/lib.rs Outdated Show resolved Hide resolved
resource/src/lib.rs Outdated Show resolved Hide resolved
resource/src/lib.rs Show resolved Hide resolved
doitian added 2 commits June 8, 2019 20:51
@doitian
chore: fix wrong variable name
d8169a3 
The variable name `relative_start_dir` does not holds a dir, it is the final path instead.
@doitian
feat: explicitly specify bundled or file system
06f0f18 
Eliminate ambiguity and simplify code.
@quake quake merged commit 23e2751 into nervosnetwork:develop Jun 11, 2019
@doitian doitian deleted the explicit-resource-config branch June 14, 2019 14:13
This was referenced Jun 21, 2019
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jjyr jjyr jjyr left review comments

@quake quake quake approved these changes

@xxuejie xxuejie xxuejie approved these changes

Assignees

@jjyr jjyr

Labels
b:cli Break cli options and config file breaking change The feature breaks consensus, database, message schema or RPC interface.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@doitian @quake @xxuejie @jjyr