grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renamed kvdb_memorydb::in_memory -> kvdb_memorydb::create

Browse Source
This commit is contained in:
debris
2017-10-15 16:17:15 +02:00
parent d88ec35a6a
commit 616cafb04a
21 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
util/src/journaldb/archivedb.rs
View File

@@ -203,12 +203,12 @@ mod tests {
use hashdb::{HashDB, DBValue};
use super::*;
use journaldb::traits::JournalDB;
use kvdb_memorydb::in_memory;
use kvdb_memorydb;
#[test]
fn insert_same_in_fork() {
// history is 1
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let x = jdb.insert(b"X");
jdb.commit_batch(1, &keccak(b"1"), None).unwrap();
@@ -230,7 +230,7 @@ mod tests {
#[test]
fn long_history() {
// history is 3
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let h = jdb.insert(b"foo");
jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
assert!(jdb.contains(&h));
@@ -248,7 +248,7 @@ mod tests {
#[test]
#[should_panic]
fn multiple_owed_removal_not_allowed() {
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let h = jdb.insert(b"foo");
jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
assert!(jdb.contains(&h));
@@ -262,7 +262,7 @@ mod tests {
#[test]
fn complex() {
// history is 1
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let foo = jdb.insert(b"foo");
let bar = jdb.insert(b"bar");
@@ -294,7 +294,7 @@ mod tests {
#[test]
fn fork() {
// history is 1
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let foo = jdb.insert(b"foo");
let bar = jdb.insert(b"bar");
@@ -320,7 +320,7 @@ mod tests {
#[test]
fn overwrite() {
// history is 1
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let foo = jdb.insert(b"foo");
jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
@@ -339,7 +339,7 @@ mod tests {
#[test]
fn fork_same_key() {
// history is 1
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
jdb.commit_batch(0, &keccak(b"0"), None).unwrap();
let foo = jdb.insert(b"foo");
@@ -355,7 +355,7 @@ mod tests {
#[test]
fn reopen() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let bar = H256::random();
let foo = {
@@ -383,7 +383,7 @@ mod tests {
#[test]
fn reopen_remove() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let foo = {
let mut jdb = ArchiveDB::new(shared_db.clone(), None);
@@ -412,7 +412,7 @@ mod tests {
#[test]
fn reopen_fork() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let (foo, _, _) = {
let mut jdb = ArchiveDB::new(shared_db.clone(), None);
// history is 1
@@ -437,7 +437,7 @@ mod tests {
#[test]
fn returns_state() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let key = {
let mut jdb = ArchiveDB::new(shared_db.clone(), None);
@@ -455,7 +455,7 @@ mod tests {
#[test]
fn inject() {
let mut jdb = ArchiveDB::new(Arc::new(in_memory(0)), None);
let mut jdb = ArchiveDB::new(Arc::new(kvdb_memorydb::create(0)), None);
let key = jdb.insert(b"dog");
jdb.inject_batch().unwrap();

10
util/src/journaldb/earlymergedb.rs
View File

@@ -552,7 +552,7 @@ mod tests {
use super::*;
use super::super::traits::JournalDB;
use ethcore_logger::init_log;
use kvdb_memorydb::in_memory;
use kvdb_memorydb;
#[test]
fn insert_same_in_fork() {
@@ -810,13 +810,13 @@ mod tests {
}
fn new_db() -> EarlyMergeDB {
let backing = Arc::new(in_memory(0));
let backing = Arc::new(kvdb_memorydb::create(0));
EarlyMergeDB::new(backing, None)
}
#[test]
fn reopen() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let bar = H256::random();
let foo = {
@@ -986,7 +986,7 @@ mod tests {
fn reopen_remove_three() {
init_log();
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let foo = keccak(b"foo");
{
@@ -1039,7 +1039,7 @@ mod tests {
#[test]
fn reopen_fork() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let (foo, bar, baz) = {
let mut jdb = EarlyMergeDB::new(shared_db.clone(), None);

12
util/src/journaldb/overlayrecentdb.rs
View File

@@ -460,10 +460,10 @@ mod tests {
use hashdb::{HashDB, DBValue};
use ethcore_logger::init_log;
use journaldb::JournalDB;
use kvdb_memorydb::in_memory;
use kvdb_memorydb;
fn new_db() -> OverlayRecentDB {
let backing = Arc::new(in_memory(0));
let backing = Arc::new(kvdb_memorydb::create(0));
OverlayRecentDB::new(backing, None)
}
@@ -705,7 +705,7 @@ mod tests {
#[test]
fn reopen() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let bar = H256::random();
let foo = {
@@ -872,7 +872,7 @@ mod tests {
fn reopen_remove_three() {
init_log();
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let foo = keccak(b"foo");
{
@@ -925,7 +925,7 @@ mod tests {
#[test]
fn reopen_fork() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
let (foo, bar, baz) = {
let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);
@@ -990,7 +990,7 @@ mod tests {
#[test]
fn earliest_era() {
let shared_db = Arc::new(in_memory(0));
let shared_db = Arc::new(kvdb_memorydb::create(0));
// empty DB
let mut jdb = OverlayRecentDB::new(shared_db.clone(), None);

4
util/src/journaldb/refcounteddb.rs
View File

@@ -210,12 +210,12 @@ mod tests {
use keccak::keccak;
use hashdb::{HashDB, DBValue};
use kvdb_memorydb::in_memory;
use kvdb_memorydb;
use super::*;
use super::super::traits::JournalDB;
fn new_db() -> RefCountedDB {
let backing = Arc::new(in_memory(0));
let backing = Arc::new(kvdb_memorydb::create(0));
RefCountedDB::new(backing, None)
}

2
util/src/overlaydb.rs
View File

@@ -50,7 +50,7 @@ impl OverlayDB {
/// Create a new instance of OverlayDB with an anonymous temporary database.
#[cfg(test)]
pub fn new_temp() -> OverlayDB {
let backing = Arc::new(::kvdb_memorydb::in_memory(0));
let backing = Arc::new(::kvdb_memorydb::create(0));
Self::new(backing, None)
}