upgrade cita trie version

core/executor/src/adapter/trie_db.rs

@@ -44,7 +44,7 @@ impl RocksTrieDB {
         Arc::clone(&self.db)
     }
 
-    fn inner_get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, RocksTrieDBError> {
+    fn inner_get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
         use trie::DB;
 
         let res = { self.cache.read().get(key).cloned() };
@@ -79,13 +79,11 @@ impl RocksTrieDB {
 }
 
 impl trie::DB for RocksTrieDB {
-    type Error = RocksTrieDBError;
-
-    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
         self.inner_get(key)
     }
 
-    fn contains(&self, key: &[u8]) -> Result<bool, Self::Error> {
+    fn contains(&self, key: &[u8]) -> Result<bool, String> {
         let res = { self.cache.read().contains_key(key) };
 
         if res {
@@ -99,7 +97,7 @@ impl trie::DB for RocksTrieDB {
         }
     }
 
-    fn insert(&self, key: Vec<u8>, value: Vec<u8>) -> Result<(), Self::Error> {
+    fn insert(&self, key: Vec<u8>, value: Vec<u8>) -> Result<(), String> {
         let inst = Instant::now();
         let size = key.len() + value.len();
 
@@ -114,9 +112,9 @@ impl trie::DB for RocksTrieDB {
         self.flush()
     }
 
-    fn insert_batch(&self, keys: Vec<Vec<u8>>, values: Vec<Vec<u8>>) -> Result<(), Self::Error> {
+    fn insert_batch(&self, keys: Vec<Vec<u8>>, values: Vec<Vec<u8>>) -> Result<(), String> {
         if keys.len() != values.len() {
-            return Err(RocksTrieDBError::BatchLengthMismatch);
+            return Err(RocksTrieDBError::BatchLengthMismatch.to_string());
         }
 
         let mut total_size = 0;
@@ -139,15 +137,15 @@ impl trie::DB for RocksTrieDB {
         self.flush()
     }
 
-    fn remove(&self, _key: &[u8]) -> Result<(), Self::Error> {
+    fn remove(&self, _key: &[u8]) -> Result<(), String> {
         Ok(())
     }
 
-    fn remove_batch(&self, _keys: &[Vec<u8>]) -> Result<(), Self::Error> {
+    fn remove_batch(&self, _keys: &[Vec<u8>]) -> Result<(), String> {
         Ok(())
     }
 
-    fn flush(&self) -> Result<(), Self::Error> {
+    fn flush(&self) -> Result<(), String> {
         let mut cache = self.cache.write();
 
         let len = cache.len();
@@ -232,9 +230,9 @@ impl From<RocksTrieDBError> for ProtocolError {
     }
 }
 
-fn to_store_err(e: rocksdb::Error) -> RocksTrieDBError {
+fn to_store_err(e: rocksdb::Error) -> String {
     log::error!("[executor] trie db {:?}", e);
-    RocksTrieDBError::Store
+    e.to_string()
 }
 
 #[cfg(test)]

protocol/Cargo.toml

@@ -31,7 +31,8 @@ rlp = "0.5"
 rlp-derive = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.27", features = ["full"] }
-trie = { package = "cita_trie", version = "4.0" }
+# trie = { package = "cita_trie", version = "4.0" }
+trie = { package = "cita_trie", git = "https://github.com/KaoImin/cita-trie.git", branch = "test" }
 
 common-crypto = { path = "../common/crypto" }
 common-hasher = { path = "../common/hasher" }