Merge branch 'main' into fix_stack_inconsistency

massalabs · Jun 14, 2024 · 9c68639 · 9c68639
2 parents 1a209b3 + 37e9307
commit 9c68639
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/massa-execution-exports/src/mapping_grpc.rs b/massa-execution-exports/src/mapping_grpc.rs
@@ -44,15 +44,14 @@ pub fn to_querystate_filter(
                     Address::from_str(&value.address)?,
                 ))
             }
-            exec::RequestItem::AddressBytecodeFinal(value) => {
-                Ok(ExecutionQueryRequestItem::AddressBytecodeCandidate(
-                    Address::from_str(&value.address)?,
-                ))
-            }
+            exec::RequestItem::AddressBytecodeFinal(value) => Ok(
+                ExecutionQueryRequestItem::AddressBytecodeFinal(Address::from_str(&value.address)?),
+            ),
             exec::RequestItem::AddressDatastoreKeysCandidate(value) => {
-                Ok(ExecutionQueryRequestItem::AddressBytecodeCandidate(
-                    Address::from_str(&value.address)?,
-                ))
+                Ok(ExecutionQueryRequestItem::AddressDatastoreKeysCandidate {
+                    addr: Address::from_str(&value.address)?,
+                    prefix: value.prefix,
+                })
             }
             exec::RequestItem::AddressDatastoreKeysFinal(value) => {
                 Ok(ExecutionQueryRequestItem::AddressDatastoreKeysFinal {

diff --git a/massa-final-state/src/final_state.rs b/massa-final-state/src/final_state.rs
@@ -532,7 +532,7 @@ impl FinalState {
     }
 
     /// Internal function called by is_db_valid
-    pub fn _is_db_valid(&self) -> AnyResult<()> {
+    fn _is_db_valid(&self) -> AnyResult<()> {
         let db = self.db.read();
 
         // check if the execution trial hash is present and valid