Skip to content

starknet_committer_and_os_cli: build storage tries concurrently based on py config #12444

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

Open
nimrod-starkware wants to merge 1 commit into
base: nimrod/parallel-reads/always-cache-on-write
Choose a base branch
from
+5 −6
Open

starknet_committer_and_os_cli: build storage tries concurrently based on py config #12444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ impl TryFrom<RawInput> for CommitterFactsDbInputImpl {
inner_map,
)?;
}
// TODO(Nimrod): Get this by adding a field to `RawInput`.
let build_storage_tries_concurrently = false;
let input = Input {
initial_read_context: FactsDbInitialRead(StateRoots {
contracts_trie_root_hash: HashOutput(Felt::from_bytes_be_slice(
Expand All @@ -104,7 +102,7 @@ impl TryFrom<RawInput> for CommitterFactsDbInputImpl {
},
config: ReaderConfig::new(
raw_input.config.warn_on_trivial_modifications,
build_storage_tries_concurrently,
raw_input.config.build_storage_tries_concurrently,
),
};
Ok(Self { input, log_level: raw_input.config.log_level.into(), storage })
Expand Down
1 change: 1 addition & 0 deletions crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/raw_input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub(crate) struct RawStorageEntry {
#[derive(Deserialize, Debug)]
pub(crate) struct RawConfigImpl {
pub warn_on_trivial_modifications: bool,
pub build_storage_tries_concurrently: bool,
pub log_level: PythonLogLevel,
}

Expand Down
6 changes: 3 additions & 3 deletions crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/read_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ fn test_simple_input_parsing() {
],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
{"warn_on_trivial_modifications": true, "log_level": 5}
{"warn_on_trivial_modifications": true, "build_storage_tries_concurrently": false, "log_level": 5}
]

"#;
Expand Down Expand Up @@ -254,7 +254,7 @@ fn test_input_parsing_with_storage_key_duplicate() {
],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 3],
{"warn_on_trivial_modifications": true, "log_level": 20}
{"warn_on_trivial_modifications": true, "build_storage_tries_concurrently": false, "log_level": 20}
]

"#;
Expand Down Expand Up @@ -296,7 +296,7 @@ fn test_input_parsing_with_mapping_key_duplicate() {
],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, 0, 0, 5],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 3],
{"warn_on_trivial_modifications": false, "log_level": 30}
{"warn_on_trivial_modifications": false, "build_storage_tries_concurrently": true, "log_level": 30}
]

"#;
Expand Down
Loading