This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
get rid of hidden mutability of Spec #10904
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
debris
commented
Jul 19, 2019
| genesis_state: self.genesis_state.clone(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Part of `Spec`. Describes the hardcoded synchronization parameters. | ||
| #[derive(Debug, Clone)] |
There was a problem hiding this comment.
Clone replaces impl Clone bolierplate.
Debug is has replaced to_json which was used to print this structure
debris
commented
Jul 19, 2019
| &Default::default(), | ||
| BasicBackend(journaldb::new_memory_db()), | ||
| )?; | ||
|
|
||
| self.state_root_memo = root; |
There was a problem hiding this comment.
run_constructors no longer mutates self.state_root_memo, so we need to set the root manutally
debris
commented
Jul 19, 2019
| .collect(); | ||
| let genesis_state: PodState = s.accounts.into(); | ||
|
|
||
| let (state_root_memo, _) = run_constructors( |
There was a problem hiding this comment.
by running constructors always before Spec is created, we ensure that spec_root_memo is always correct
debris
commented
Jul 19, 2019
debris
commented
Jul 19, 2019
| #[serde(deny_unknown_fields)] | ||
| #[serde(rename_all = "camelCase")] | ||
| pub struct HardcodedSync { | ||
| /// Hexadecimal of the RLP encoding of the header of the block to start synchronization from. | ||
| pub header: String, | ||
| pub header: Bytes, |
There was a problem hiding this comment.
it should be Bytes, not String. Someone did it out of laziness and, because of that we had to deal unparsed string in ethcore
debris
commented
Jul 19, 2019
| @@ -68,7 +68,6 @@ fn make_spec(chain: &BlockChain) -> Spec { | |||
| let state = chain.pre_state.clone().into(); | |||
| spec.set_genesis_state(state).expect("unable to set genesis state"); | |||
| spec.overwrite_genesis_params(genesis); | |||
| assert!(spec.is_state_root_valid()); | |||
There was a problem hiding this comment.
it's always valid now
debris
commented
Jul 19, 2019
debris
added
A0-pleasereview 🤓
ordian
approved these changes
Jul 21, 2019
ordian
added
A8-looksgood 🦄
tomusdrw
approved these changes
Jul 29, 2019
| db | ||
| )?; | ||
|
|
||
| assert_eq!(root, self.state_root(), "Spec's state root has not been precomputed correctly."); |
There was a problem hiding this comment.
Is it safe / expected to panic here?
There was a problem hiding this comment.
yes, cause self.state_root() is always created during init with the same constructors
ordian
added a commit
that referenced
this pull request
Aug 7, 2019
* master: journaldb changes (#10929) Allow default block parameter to be blockHash (#10932) Enable sealing when engine is ready (#10938) Fix some warnings and typos. (#10941) Updated security@parity.io key (#10939) Change the return type of step_inner function. (#10940) get rid of hidden mutability of Spec (#10904) simplify BlockReward::reward implementation (#10906) Kaspersky AV whitelisting (#10919) additional arithmetic EVM opcode benchmarks (#10916) [Cargo.lock] cargo update -p crossbeam-epoch (#10921) Fixes incorrect comment. (#10913) Add file path to disk map write/read warnings (#10911)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
changes in this pr:
Spec::state_root_memofromRwLock<H256>toH256SpecHardcodedSyncis being deserialized from json and printed