From ab0aabf02c1cf66c0bc74b448534ab37c802273c Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 18 Jan 2016 23:54:16 +0100 Subject: [PATCH 1/4] PR suggestion. --- util/src/overlaydb.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/src/overlaydb.rs b/util/src/overlaydb.rs index 07c992693..e8492091f 100644 --- a/util/src/overlaydb.rs +++ b/util/src/overlaydb.rs @@ -137,7 +137,7 @@ impl OverlayDB { let mut s = RlpStream::new_list(2); s.append(&payload.1); s.append(&payload.0); - self.backing.put(&key.bytes(), &s.out()).expect("Low-level database error. Some issue with your hard disk?"); + self.backing.put(&key.bytes(), s.as_raw()).expect("Low-level database error. Some issue with your hard disk?"); false } else { self.backing.delete(&key.bytes()).expect("Low-level database error. Some issue with your hard disk?"); From ec3bc85f222028bad6484b459ca77365a52461da Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 19 Jan 2016 11:53:38 +0100 Subject: [PATCH 2/4] Fix tests. --- src/account.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/account.rs b/src/account.rs index c64e80ed8..c6c4136df 100644 --- a/src/account.rs +++ b/src/account.rs @@ -236,7 +236,7 @@ mod tests { #[test] fn storage_at() { - let mut db = MemoryDB::new_temp(); + let mut db = MemoryDB::new(); let rlp = { let mut a = Account::new_contract(U256::from(69u8)); a.set_storage(H256::from(&U256::from(0x00u64)), H256::from(&U256::from(0x1234u64))); @@ -254,7 +254,7 @@ mod tests { #[test] fn note_code() { - let mut db = MemoryDB::new_temp(); + let mut db = MemoryDB::new(); let rlp = { let mut a = Account::new_contract(U256::from(69u8)); @@ -273,7 +273,7 @@ mod tests { #[test] fn commit_storage() { let mut a = Account::new_contract(U256::from(69u8)); - let mut db = MemoryDB::new_temp(); + let mut db = MemoryDB::new(); a.set_storage(x!(0), x!(0x1234)); assert_eq!(a.storage_root(), None); a.commit_storage(&mut db); @@ -283,7 +283,7 @@ mod tests { #[test] fn commit_remove_commit_storage() { let mut a = Account::new_contract(U256::from(69u8)); - let mut db = MemoryDB::new_temp(); + let mut db = MemoryDB::new(); a.set_storage(x!(0), x!(0x1234)); a.commit_storage(&mut db); a.set_storage(x!(1), x!(0x1234)); @@ -296,7 +296,7 @@ mod tests { #[test] fn commit_code() { let mut a = Account::new_contract(U256::from(69u8)); - let mut db = MemoryDB::new_temp(); + let mut db = MemoryDB::new(); a.init_code(vec![0x55, 0x44, 0xffu8]); assert_eq!(a.code_hash(), SHA3_EMPTY); a.commit_code(&mut db); From af3d76fbf14df4c5ad6f2b5eeb1ac0aa914e3ba9 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 19 Jan 2016 11:56:41 +0100 Subject: [PATCH 3/4] Another fix. --- src/ethereum/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ethereum/mod.rs b/src/ethereum/mod.rs index 25a804db3..d9be7be85 100644 --- a/src/ethereum/mod.rs +++ b/src/ethereum/mod.rs @@ -40,7 +40,7 @@ mod tests { fn ensure_db_good() { let engine = new_morden().to_engine().unwrap(); let genesis_header = engine.spec().genesis_header(); - let mut db = MemoryDB::new_temp(); + let mut db = MemoryDB::new(); engine.spec().ensure_db_good(&mut db); let s = State::from_existing(db.clone(), genesis_header.state_root.clone(), engine.account_start_nonce()); assert_eq!(s.balance(&address_from_hex("0000000000000000000000000000000000000001")), U256::from(1u64)); From e82bcedf2e69c74af381b03ededa1db709a04b14 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 19 Jan 2016 11:57:10 +0100 Subject: [PATCH 4/4] Fix again. --- src/ethereum/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ethereum/mod.rs b/src/ethereum/mod.rs index d9be7be85..e97ac79a3 100644 --- a/src/ethereum/mod.rs +++ b/src/ethereum/mod.rs @@ -40,7 +40,7 @@ mod tests { fn ensure_db_good() { let engine = new_morden().to_engine().unwrap(); let genesis_header = engine.spec().genesis_header(); - let mut db = MemoryDB::new(); + let mut db = JournalDB::new_temp(); engine.spec().ensure_db_good(&mut db); let s = State::from_existing(db.clone(), genesis_header.state_root.clone(), engine.account_start_nonce()); assert_eq!(s.balance(&address_from_hex("0000000000000000000000000000000000000001")), U256::from(1u64));