Merk migration

Cargo.toml

@@ -13,7 +13,7 @@ tendermint-rpc = { version = "0.38.0", features = [
 ], optional = true }
 tendermint = { version = "0.38.0", optional = true }
 tendermint-proto = { version = "0.38.0" }
-merk = { git = "https://github.com/turbofish-org/merk", rev = "84261c2c0fdcc09792cede6b21ba72b6d008fea6", optional = true, default-features = false }
+merk = { git = "https://github.com/turbofish-org/merk", rev = "97fca3d9b8d05fb265bbd0c07100bdcddcbdfd37", optional = true, default-features = false }
 orga-macros = { path = "macros", version = "0.3.1" }
 log = "0.4.17"
 hex-literal = "0.4.1"

src/abci/node.rs

@@ -8,7 +8,7 @@
 use crate::plugins::{ABCICall, ABCIPlugin};
 use crate::query::Query;
 use crate::state::State;
-use crate::store::{BackingStore, Read, Shared, Store, Write};
+use crate::store::{BackingStore, BufStore, Read, Shared, Store, Write};
 use crate::tendermint::Child as TendermintChild;
 use crate::tendermint::Tendermint;
 use crate::{Error, Result};
@@ -354,8 +354,10 @@
         Context::add(crate::plugins::ChainId(chain_id.to_string()));
 
         log::info!("Migrating store data... (This might take a while)");
-        let store = Shared::new(merk_store);
-        let mut store = Store::new(BackingStore::Merk(store));
+        let store = Shared::new(BufStore::wrap(Shared::new(BufStore::wrap(Shared::new(
+            merk_store,
+        )))));
+        let mut store = Store::new(BackingStore::WrappedMerk(store));
         let bytes = store.get(&[]).unwrap().unwrap();
 
         orga::set_compat_mode(compat_mode);
@@ -374,8 +376,13 @@
                 [vec![version.len() as u8], version.clone()].concat(),
             )
             .unwrap();
-        if let BackingStore::Merk(merk_store) = store.into_backing_store().into_inner() {
-            let mut store = merk_store.into_inner();
+        if let BackingStore::WrappedMerk(wrapper) = store.into_backing_store().into_inner() {
+            let mut wrapper = wrapper.into_inner();
+            wrapper.flush().unwrap();
+            let mut wrapper = wrapper.into_inner().into_inner();
+            wrapper.flush().unwrap();
+            let mut store = wrapper.into_inner().into_inner();
+
             store
                 .write(vec![(b"consensus_version".to_vec(), Some(version))])
                 .unwrap();

src/merk/store.rs

@@ -53,22 +53,22 @@
     }
 
     /// Opens a `MerkStore` at the provided path for read-only access.
-    pub fn open_readonly<P: AsRef<Path>>(home: P) -> Self {
+    pub fn open_readonly<P: AsRef<Path>>(home: P) -> Result<Self> {
         let home = home.as_ref().to_path_buf();
-        let merk = Merk::open_readonly(home.join("db")).unwrap();
+        let merk = Merk::open_readonly(home.join("db"))?;
 
         // TODO: populate snapshots, if we can do it safely concurrently with
         // other processes
 
-        MerkStore {
+        Ok(MerkStore {
             map: Some(Default::default()),
             merk: Some(merk),
             snapshots: snapshot::Snapshots::default(),
             home,
             target_snapshot: None,
             restorer: None,
             mem_snapshots: BTreeMap::new(),
-        }
+        })
     }
 
     pub fn initialized<P: AsRef<Path>>(home: P) -> bool {

src/store/bufstore.rs

@@ -70,6 +70,10 @@
         &self.store
     }
 
+    pub fn into_inner(self) -> S {
+        self.store
+    }
+
     /// Consumes the `BufStore`'s in-memory buffer and writes all of its values
     /// to the underlying store.
     ///