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.
0xPolygonMiden · Nov 20, 2024 · d175784 · d175784
1 parent 37430cc
commit d175784
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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<A: AdviceProvider>(
     }
 
     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<A: AdviceProvider>(
     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<A: AdviceProvider>(
             .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
@@ -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<Felt>) -> Result<(), ExecutionError>;
+    fn insert_into_map(&mut self, key: Word, values: Vec<Felt>);
 
     /// 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<Felt>) -> Result<(), ExecutionError> {
+    fn insert_into_map(&mut self, key: Word, values: Vec<Felt>) {
         T::insert_into_map(self, key, values)
     }
 

diff --git 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<Felt>) -> Result<(), ExecutionError> {
+    fn insert_into_map(&mut self, key: Word, values: Vec<Felt>) {
         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<Felt>) -> Result<(), ExecutionError> {
+    fn insert_into_map(&mut self, key: Word, values: Vec<Felt>)  {
         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<Felt>) -> Result<(), ExecutionError> {
+    fn insert_into_map(&mut self, key: Word, values: Vec<Felt>)  {
         self.provider.insert_into_map(key, values)
     }