From dbabf50aced485ba35957dd6f0ee20447b1f26f1 Mon Sep 17 00:00:00 2001 From: Dan Cline <6798349+Rjected@users.noreply.github.com> Date: Wed, 14 Feb 2024 16:38:17 -0500 Subject: [PATCH] rename to write_bundle_state --- bin/reth/src/commands/debug_cmd/in_memory_merkle.rs | 2 +- crates/node-core/src/init.rs | 2 +- crates/stages/src/stages/execution.rs | 2 +- .../src/bundle_state/bundle_state_with_receipts.rs | 12 ++++++------ .../provider/src/providers/database/provider.rs | 4 ++-- crates/storage/provider/src/traits/state.rs | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs b/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs index 7ab62181dd..2bcd0adfcc 100644 --- a/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs +++ b/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs @@ -199,7 +199,7 @@ impl Command { .map_err(|_| BlockValidationError::SenderRecoveryError)?, None, )?; - provider_rw.write_state(block_state, OriginalValuesKnown::No)?; + provider_rw.write_bundle_state(block_state, OriginalValuesKnown::No)?; let storage_lists = provider_rw.changed_storages_with_range(block.number..=block.number)?; let storages = provider_rw.plain_state_storages(storage_lists)?; provider_rw.insert_storage_for_hashing(storages)?; diff --git a/crates/node-core/src/init.rs b/crates/node-core/src/init.rs index 8abe252d3a..25ade1332e 100644 --- a/crates/node-core/src/init.rs +++ b/crates/node-core/src/init.rs @@ -152,7 +152,7 @@ pub fn insert_genesis_state( 0, ); - provider.write_state(bundle, OriginalValuesKnown::Yes)?; + provider.write_bundle_state(bundle, OriginalValuesKnown::Yes)?; Ok(()) } diff --git a/crates/stages/src/stages/execution.rs b/crates/stages/src/stages/execution.rs index 67ffc9f782..976e237160 100644 --- a/crates/stages/src/stages/execution.rs +++ b/crates/stages/src/stages/execution.rs @@ -195,7 +195,7 @@ impl ExecutionStage { let time = Instant::now(); // write output - provider.write_state(state, OriginalValuesKnown::Yes)?; + provider.write_bundle_state(state, OriginalValuesKnown::Yes)?; let db_write_duration = time.elapsed(); debug!( target: "sync::stages::execution", diff --git a/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs b/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs index 21d14a1528..136db7eef1 100644 --- a/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs +++ b/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs @@ -510,7 +510,7 @@ mod tests { let state = BundleStateWithReceipts::new(state.take_bundle(), Receipts::new(), 1); provider - .write_state(state, OriginalValuesKnown::Yes) + .write_bundle_state(state, OriginalValuesKnown::Yes) .expect("Could not write bundle state to DB"); // Check plain storage state @@ -609,7 +609,7 @@ mod tests { state.merge_transitions(BundleRetention::Reverts); let state = BundleStateWithReceipts::new(state.take_bundle(), Receipts::new(), 2); provider - .write_state(state, OriginalValuesKnown::Yes) + .write_bundle_state(state, OriginalValuesKnown::Yes) .expect("Could not write bundle state to DB"); assert_eq!( @@ -674,7 +674,7 @@ mod tests { init_state.merge_transitions(BundleRetention::Reverts); let state = BundleStateWithReceipts::new(init_state.take_bundle(), Receipts::new(), 0); provider - .write_state(state, OriginalValuesKnown::Yes) + .write_bundle_state(state, OriginalValuesKnown::Yes) .expect("Could not write init bundle state to DB"); let mut state = State::builder().with_bundle_update().build(); @@ -820,7 +820,7 @@ mod tests { let state = BundleStateWithReceipts::new(bundle, Receipts::new(), 1); provider - .write_state(state, OriginalValuesKnown::Yes) + .write_bundle_state(state, OriginalValuesKnown::Yes) .expect("Could not write bundle state to DB"); let mut storage_changeset_cursor = provider @@ -984,7 +984,7 @@ mod tests { init_state.merge_transitions(BundleRetention::Reverts); let state = BundleStateWithReceipts::new(init_state.take_bundle(), Receipts::new(), 0); provider - .write_state(state, OriginalValuesKnown::Yes) + .write_bundle_state(state, OriginalValuesKnown::Yes) .expect("Could not write init bundle state to DB"); let mut state = State::builder().with_bundle_update().build(); @@ -1030,7 +1030,7 @@ mod tests { state.merge_transitions(BundleRetention::Reverts); let state = BundleStateWithReceipts::new(state.take_bundle(), Receipts::new(), 1); provider - .write_state(state, OriginalValuesKnown::Yes) + .write_bundle_state(state, OriginalValuesKnown::Yes) .expect("Could not write bundle state to DB"); let mut storage_changeset_cursor = provider diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs index 1e87f82f07..9e29b88884 100644 --- a/crates/storage/provider/src/providers/database/provider.rs +++ b/crates/storage/provider/src/providers/database/provider.rs @@ -2562,7 +2562,7 @@ impl BlockWriter for DatabaseProvider { // Write state and changesets to the database. // Must be written after blocks because of the receipt lookup. - self.write_state(state, OriginalValuesKnown::No)?; + self.write_bundle_state(state, OriginalValuesKnown::No)?; durations_recorder.record_relative(metrics::Action::InsertState); // insert hashes and intermediate merkle nodes @@ -2590,7 +2590,7 @@ impl StateWriter for DatabaseProvider { /// /// `is_value_known` should be set to `Not` if the [BundleStateWithReceipts] has some of its /// state detached, This would make some original values not known. - fn write_state( + fn write_bundle_state( &self, state: BundleStateWithReceipts, is_value_known: OriginalValuesKnown, diff --git a/crates/storage/provider/src/traits/state.rs b/crates/storage/provider/src/traits/state.rs index b8082ae93d..37f0ab433b 100644 --- a/crates/storage/provider/src/traits/state.rs +++ b/crates/storage/provider/src/traits/state.rs @@ -238,7 +238,7 @@ pub trait StateWriter: Send + Sync { /// /// `is_value_known` should be set to `Not` if the [BundleStateWithReceipts] has some of its /// state detached, This would make some original values not known. - fn write_state( + fn write_bundle_state( &self, state: BundleStateWithReceipts, is_value_known: OriginalValuesKnown,