fix rebase onto 1.1.0

mimblewimble · Mar 11, 2019 · c844177 · c844177
1 parent aec9ed2
commit c844177
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/servers/src/common/types.rs b/servers/src/common/types.rs
@@ -27,6 +27,7 @@ use crate::p2p;
 use crate::pool;
 use crate::pool::types::DandelionConfig;
 use crate::store;
+use crate::util::RwLock;
 
 /// Error type wrapping underlying module errors.
 #[derive(Debug)]

diff --git a/store/src/lmdb.rs b/store/src/lmdb.rs
@@ -253,7 +253,7 @@ impl Store {
 	pub fn iter<T: ser::Readable>(&self, from: &[u8]) -> Result<SerIterator<T>, Error> {
 		let db = self.db.read();
 		let tx = Arc::new(lmdb::ReadTransaction::new(self.env.clone())?);
-		let cursor = Arc::new(tx.cursor(self.db.clone())?);
+		let cursor = Arc::new(tx.cursor(db.as_ref().unwrap().clone()).unwrap());
 		Ok(SerIterator {
 			tx,
 			cursor,