From d1757845d7fdf2ecd3100fe2b4ae517a703de3de Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Fri, 15 Nov 2024 13:58:50 +0200 Subject: [PATCH] refactor: make `AdviceProvider::insert_into_map` infallible Since the behavior if the key is already present is to replace the value with the new one there is no other error that can possibly arise in this method. --- processor/src/host/advice/injectors/adv_map_injectors.rs | 6 +++--- processor/src/host/advice/mod.rs | 4 ++-- processor/src/host/advice/providers.rs | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/processor/src/host/advice/injectors/adv_map_injectors.rs b/processor/src/host/advice/injectors/adv_map_injectors.rs index 4eab49baf..11e8efccb 100644 --- a/processor/src/host/advice/injectors/adv_map_injectors.rs +++ b/processor/src/host/advice/injectors/adv_map_injectors.rs @@ -43,7 +43,7 @@ pub(crate) fn insert_mem_values_into_adv_map( } let key = process.get_stack_word(0); - advice_provider.insert_into_map(key, values)?; + advice_provider.insert_into_map(key, values); Ok(HostResponse::None) } @@ -76,7 +76,7 @@ pub(crate) fn insert_hdword_into_adv_map( let mut values = Vec::with_capacity(2 * WORD_SIZE); values.extend_from_slice(&word1); values.extend_from_slice(&word0); - advice_provider.insert_into_map(key.into(), values)?; + advice_provider.insert_into_map(key.into(), values); Ok(HostResponse::None) } @@ -125,7 +125,7 @@ pub(crate) fn insert_hperm_into_adv_map( .expect("failed to extract digest from state"), ); - advice_provider.insert_into_map(key.into(), values)?; + advice_provider.insert_into_map(key.into(), values); Ok(HostResponse::None) } diff --git a/processor/src/host/advice/mod.rs b/processor/src/host/advice/mod.rs index 044f7e8fa..f00274c33 100644 --- a/processor/src/host/advice/mod.rs +++ b/processor/src/host/advice/mod.rs @@ -613,7 +613,7 @@ pub trait AdviceProvider: Sized { /// /// If the specified key is already present in the advice map, the values under the key /// are replaced with the specified values. - fn insert_into_map(&mut self, key: Word, values: Vec) -> Result<(), ExecutionError>; + fn insert_into_map(&mut self, key: Word, values: Vec); /// Returns a signature on a message using a public key. fn get_signature( @@ -729,7 +729,7 @@ where T::push_stack(self, source) } - fn insert_into_map(&mut self, key: Word, values: Vec) -> Result<(), ExecutionError> { + fn insert_into_map(&mut self, key: Word, values: Vec) { T::insert_into_map(self, key, values) } diff --git a/processor/src/host/advice/providers.rs b/processor/src/host/advice/providers.rs index 6cc10efe2..75de9486a 100644 --- a/processor/src/host/advice/providers.rs +++ b/processor/src/host/advice/providers.rs @@ -131,9 +131,8 @@ where self.map.get(key).map(|v| v.as_slice()) } - fn insert_into_map(&mut self, key: Word, values: Vec) -> Result<(), ExecutionError> { + fn insert_into_map(&mut self, key: Word, values: Vec) { self.map.insert(key.into(), values); - Ok(()) } // MERKLE STORE @@ -272,7 +271,7 @@ impl AdviceProvider for MemAdviceProvider { self.provider.push_stack(source) } - fn insert_into_map(&mut self, key: Word, values: Vec) -> Result<(), ExecutionError> { + fn insert_into_map(&mut self, key: Word, values: Vec) { self.provider.insert_into_map(key, values) } @@ -390,7 +389,7 @@ impl AdviceProvider for RecAdviceProvider { self.provider.push_stack(source) } - fn insert_into_map(&mut self, key: Word, values: Vec) -> Result<(), ExecutionError> { + fn insert_into_map(&mut self, key: Word, values: Vec) { self.provider.insert_into_map(key, values) }