diff --git a/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs index ae18849d83..dc89c9f592 100644 --- a/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs +++ b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs @@ -301,7 +301,6 @@ fn generate_runtime_api_base_structures() -> Result { self.changes.replace(Default::default()).into_storage_changes( backend, - parent_hash, self.storage_transaction_cache.replace(Default::default()), state_version, ) diff --git a/substrate/primitives/state-machine/src/ext.rs b/substrate/primitives/state-machine/src/ext.rs index e87b22d4f9..7b7e4b47f1 100644 --- a/substrate/primitives/state-machine/src/ext.rs +++ b/substrate/primitives/state-machine/src/ext.rs @@ -660,7 +660,6 @@ where self.overlay .drain_storage_changes( self.backend, - Default::default(), self.storage_transaction_cache, Default::default(), // using any state ) @@ -680,12 +679,7 @@ where } let changes = self .overlay - .drain_storage_changes( - self.backend, - Default::default(), - self.storage_transaction_cache, - state_version, - ) + .drain_storage_changes(self.backend, self.storage_transaction_cache, state_version) .expect(EXT_NOT_ALLOWED_TO_FAIL); self.backend .commit( diff --git a/substrate/primitives/state-machine/src/overlayed_changes/mod.rs b/substrate/primitives/state-machine/src/overlayed_changes/mod.rs index d75feec0ce..59f3e1cffa 100644 --- a/substrate/primitives/state-machine/src/overlayed_changes/mod.rs +++ b/substrate/primitives/state-machine/src/overlayed_changes/mod.rs @@ -500,21 +500,19 @@ impl OverlayedChanges { pub fn into_storage_changes, H: Hasher>( mut self, backend: &B, - parent_hash: H::Out, mut cache: StorageTransactionCache, state_version: StateVersion, ) -> Result, DefaultError> where H::Out: Ord + Encode + 'static, { - self.drain_storage_changes(backend, parent_hash, &mut cache, state_version) + self.drain_storage_changes(backend, &mut cache, state_version) } /// Drain all changes into a [`StorageChanges`] instance. Leave empty overlay in place. pub fn drain_storage_changes, H: Hasher>( &mut self, backend: &B, - _parent_hash: H::Out, mut cache: &mut StorageTransactionCache, state_version: StateVersion, ) -> Result, DefaultError> diff --git a/substrate/primitives/state-machine/src/testing.rs b/substrate/primitives/state-machine/src/testing.rs index 7f71d24b76..bc462ae01a 100644 --- a/substrate/primitives/state-machine/src/testing.rs +++ b/substrate/primitives/state-machine/src/testing.rs @@ -179,7 +179,6 @@ where pub fn commit_all(&mut self) -> Result<(), String> { let changes = self.overlay.drain_storage_changes::<_, _>( &self.backend, - Default::default(), &mut Default::default(), self.state_version, )?; diff --git a/substrate/utils/frame/try-runtime/cli/src/commands/follow_chain.rs b/substrate/utils/frame/try-runtime/cli/src/commands/follow_chain.rs index 82bc048801..7400813b91 100644 --- a/substrate/utils/frame/try-runtime/cli/src/commands/follow_chain.rs +++ b/substrate/utils/frame/try-runtime/cli/src/commands/follow_chain.rs @@ -150,7 +150,6 @@ where let storage_changes = changes .drain_storage_changes( &state_ext.backend, - Default::default(), &mut Default::default(), // Note that in case a block contains a runtime upgrade, // state version could potentially be incorrect here,