fix: tests
This commit is contained in:
@@ -42,6 +42,7 @@ pub fn init_chain(dir_name: &str, genesis: Block) -> Chain {
|
|||||||
genesis,
|
genesis,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ fn setup_with_status_adapter(dir_name: &str, genesis: Block, adapter: Arc<Status
|
|||||||
genesis,
|
genesis,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
@@ -1057,6 +1058,7 @@ fn actual_diff_iter_output() {
|
|||||||
genesis_block,
|
genesis_block,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let iter = chain.difficulty_iter().unwrap();
|
let iter = chain.difficulty_iter().unwrap();
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ fn test_store_kernel_idx() {
|
|||||||
|
|
||||||
let commit = Commitment::from_vec(vec![]);
|
let commit = Commitment::from_vec(vec![]);
|
||||||
|
|
||||||
let store = ChainStore::new(chain_dir).unwrap();
|
let store = ChainStore::new(chain_dir, None).unwrap();
|
||||||
let mut batch = store.batch().unwrap();
|
let mut batch = store.batch().unwrap();
|
||||||
let index = store::nrd_recent_kernel_index();
|
let index = store::nrd_recent_kernel_index();
|
||||||
|
|
||||||
@@ -185,7 +185,7 @@ fn test_store_kernel_idx_pop_back() {
|
|||||||
|
|
||||||
let commit = Commitment::from_vec(vec![]);
|
let commit = Commitment::from_vec(vec![]);
|
||||||
|
|
||||||
let store = ChainStore::new(chain_dir).unwrap();
|
let store = ChainStore::new(chain_dir, None).unwrap();
|
||||||
let mut batch = store.batch().unwrap();
|
let mut batch = store.batch().unwrap();
|
||||||
let index = store::nrd_recent_kernel_index();
|
let index = store::nrd_recent_kernel_index();
|
||||||
|
|
||||||
@@ -293,7 +293,7 @@ fn test_store_kernel_idx_rewind() {
|
|||||||
|
|
||||||
let commit = Commitment::from_vec(vec![]);
|
let commit = Commitment::from_vec(vec![]);
|
||||||
|
|
||||||
let store = ChainStore::new(chain_dir).unwrap();
|
let store = ChainStore::new(chain_dir, None).unwrap();
|
||||||
let mut batch = store.batch().unwrap();
|
let mut batch = store.batch().unwrap();
|
||||||
let index = store::nrd_recent_kernel_index();
|
let index = store::nrd_recent_kernel_index();
|
||||||
|
|
||||||
@@ -395,7 +395,7 @@ fn test_store_kernel_idx_multiple_commits() {
|
|||||||
let commit = Commitment::from_vec(vec![]);
|
let commit = Commitment::from_vec(vec![]);
|
||||||
let commit2 = Commitment::from_vec(vec![1]);
|
let commit2 = Commitment::from_vec(vec![1]);
|
||||||
|
|
||||||
let store = ChainStore::new(chain_dir).unwrap();
|
let store = ChainStore::new(chain_dir, None).unwrap();
|
||||||
let mut batch = store.batch().unwrap();
|
let mut batch = store.batch().unwrap();
|
||||||
let index = store::nrd_recent_kernel_index();
|
let index = store::nrd_recent_kernel_index();
|
||||||
|
|
||||||
@@ -483,7 +483,7 @@ fn test_store_kernel_idx_clear() -> Result<(), Error> {
|
|||||||
let commit = Commitment::from_vec(vec![]);
|
let commit = Commitment::from_vec(vec![]);
|
||||||
let commit2 = Commitment::from_vec(vec![1]);
|
let commit2 = Commitment::from_vec(vec![1]);
|
||||||
|
|
||||||
let store = ChainStore::new(chain_dir)?;
|
let store = ChainStore::new(chain_dir, None)?;
|
||||||
let index = store::nrd_recent_kernel_index();
|
let index = store::nrd_recent_kernel_index();
|
||||||
|
|
||||||
// Add a couple of single entries to the index and commit the batch.
|
// Add a couple of single entries to the index and commit the batch.
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ fn test_coinbase_maturity() {
|
|||||||
genesis_block,
|
genesis_block,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ fn test_header_perf_impl(is_test_chain: bool, src_root_dir: &str, dest_root_dir:
|
|||||||
genesis.clone(),
|
genesis.clone(),
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
);
|
);
|
||||||
@@ -62,6 +63,7 @@ fn test_header_perf_impl(is_test_chain: bool, src_root_dir: &str, dest_root_dir:
|
|||||||
genesis.clone(),
|
genesis.clone(),
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ impl SegmenterResponder {
|
|||||||
genesis,
|
genesis,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
),
|
),
|
||||||
@@ -134,6 +135,7 @@ impl DesegmenterRequestor {
|
|||||||
genesis,
|
genesis,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ fn test_pibd_chain_validation_impl(is_test_chain: bool, src_root_dir: &str) {
|
|||||||
genesis.clone(),
|
genesis.clone(),
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ fn test_unexpected_zip() {
|
|||||||
let db_root = format!(".grin_txhashset_zip");
|
let db_root = format!(".grin_txhashset_zip");
|
||||||
clean_output_dir(&db_root);
|
clean_output_dir(&db_root);
|
||||||
{
|
{
|
||||||
let chain_store = ChainStore::new(&db_root).unwrap();
|
let chain_store = ChainStore::new(&db_root, None).unwrap();
|
||||||
let store = Arc::new(chain_store);
|
let store = Arc::new(chain_store);
|
||||||
txhashset::TxHashSet::open(db_root.clone(), store.clone(), None).unwrap();
|
txhashset::TxHashSet::open(db_root.clone(), store.clone(), None).unwrap();
|
||||||
let head = BlockHeader::default();
|
let head = BlockHeader::default();
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ pub fn init_chain(dir_name: &str, genesis: Block) -> Chain {
|
|||||||
genesis,
|
genesis,
|
||||||
pow::verify_size,
|
pow::verify_size,
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-4
@@ -79,7 +79,7 @@ fn test_exists() -> Result<(), store::Error> {
|
|||||||
setup(test_dir);
|
setup(test_dir);
|
||||||
|
|
||||||
let prefix = b'P';
|
let prefix = b'P';
|
||||||
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
|
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
|
||||||
|
|
||||||
let key = [0, 0, 0, 1];
|
let key = [0, 0, 0, 1];
|
||||||
let value = [1, 1, 1, 1];
|
let value = [1, 1, 1, 1];
|
||||||
@@ -109,7 +109,7 @@ fn test_iter() -> Result<(), store::Error> {
|
|||||||
setup(test_dir);
|
setup(test_dir);
|
||||||
|
|
||||||
let prefix = b'P';
|
let prefix = b'P';
|
||||||
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
|
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
|
||||||
|
|
||||||
let key = [0, 0, 0, 1];
|
let key = [0, 0, 0, 1];
|
||||||
let value = [1, 1, 1, 1];
|
let value = [1, 1, 1, 1];
|
||||||
@@ -148,7 +148,7 @@ fn lmdb_allocate() -> Result<(), store::Error> {
|
|||||||
// Allocate more than the initial chunk, ensuring
|
// Allocate more than the initial chunk, ensuring
|
||||||
// the DB resizes underneath
|
// the DB resizes underneath
|
||||||
{
|
{
|
||||||
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
|
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
|
||||||
|
|
||||||
for i in 0..WRITE_CHUNK_SIZE * 2 {
|
for i in 0..WRITE_CHUNK_SIZE * 2 {
|
||||||
println!("Allocating chunk: {}", i);
|
println!("Allocating chunk: {}", i);
|
||||||
@@ -164,7 +164,7 @@ fn lmdb_allocate() -> Result<(), store::Error> {
|
|||||||
println!("***********************************");
|
println!("***********************************");
|
||||||
// Open env again and keep adding
|
// Open env again and keep adding
|
||||||
{
|
{
|
||||||
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
|
let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
|
||||||
for i in 0..WRITE_CHUNK_SIZE * 2 {
|
for i in 0..WRITE_CHUNK_SIZE * 2 {
|
||||||
println!("Allocating chunk: {}", i);
|
println!("Allocating chunk: {}", i);
|
||||||
let chunk = PhatChunkStruct::new();
|
let chunk = PhatChunkStruct::new();
|
||||||
@@ -253,6 +253,7 @@ fn test_migration() -> Result<(), store::Error> {
|
|||||||
Some(DEFAULT_ENV_NAME),
|
Some(DEFAULT_ENV_NAME),
|
||||||
vec![test_prefix_1, test_prefix_2],
|
vec![test_prefix_1, test_prefix_2],
|
||||||
None,
|
None,
|
||||||
|
None,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
// Check we can see key value.
|
// Check we can see key value.
|
||||||
|
|||||||
Reference in New Issue
Block a user