ledger-db restructuring (#3441)

massalabs · Feb 1, 2023 · fad42ae · fad42ae
1 parent 03776e5
commit fad42ae
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 221 deletions.
diff --git a/massa-execution-worker/src/speculative_ledger.rs b/massa-execution-worker/src/speculative_ledger.rs
@@ -460,9 +460,12 @@ impl SpeculativeLedger {
                 .fetch_active_history_data_entry(addr, key)
             {
                 HistorySearchResult::Present(_entry) => true,
-                HistorySearchResult::NoInfo => {
-                    self.final_state.read().ledger.has_data_entry(addr, key)
-                }
+                HistorySearchResult::NoInfo => self
+                    .final_state
+                    .read()
+                    .ledger
+                    .get_data_entry(addr, key)
+                    .is_some(),
                 HistorySearchResult::Absent => false,
             }
         })

diff --git a/massa-ledger-exports/src/controller.rs b/massa-ledger-exports/src/controller.rs
@@ -42,16 +42,6 @@ pub trait LedgerController: Send + Sync + Debug {
     /// A copy of the datastore value, or `None` if the ledger entry or datastore entry was not found
     fn get_data_entry(&self, addr: &Address, key: &[u8]) -> Option<Vec<u8>>;
 
-    /// Checks for the existence of a datastore entry for a given address.
-    ///
-    /// # Arguments
-    /// * `addr`: target address
-    /// * `key`: datastore key
-    ///
-    /// # Returns
-    /// true if the datastore entry was found, or false if the ledger entry or datastore entry was not found
-    fn has_data_entry(&self, addr: &Address, key: &[u8]) -> bool;
-
     /// Get every key of the datastore for a given address.
     ///
     /// # Returns

diff --git a/massa-ledger-worker/src/ledger.rs b/massa-ledger-worker/src/ledger.rs
@@ -134,29 +134,12 @@ impl LedgerController for FinalLedger {
             .get_sub_entry(addr, LedgerSubEntry::Datastore(key.to_owned()))
     }
 
-    /// Checks for the existence of a datastore entry for a given address.
-    ///
-    /// # Arguments
-    /// * `addr`: target address
-    /// * `key`: datastore key
-    ///
-    /// # Returns
-    /// true if the datastore entry was found, or false if the ledger entry or datastore entry was not found
-    fn has_data_entry(&self, addr: &Address, key: &[u8]) -> bool {
-        self.sorted_ledger
-            .get_sub_entry(addr, LedgerSubEntry::Datastore(key.to_owned()))
-            .is_some()
-    }
-
     /// Get every key of the datastore for a given address.
     ///
     /// # Returns
     /// A `BTreeSet` of the datastore keys
     fn get_datastore_keys(&self, addr: &Address) -> Option<BTreeSet<Vec<u8>>> {
-        match self.entry_exists(addr) {
-            true => Some(self.sorted_ledger.get_datastore_keys(addr)),
-            false => None,
-        }
+        self.sorted_ledger.get_datastore_keys(addr)
     }
 
     /// Get the current disk ledger hash