f: review comments

Author: joostjager

Cargo.toml

@@ -103,7 +103,6 @@ log = { version = "0.4.22", default-features = false, features = ["std"]}
 
 vss-client = "0.3"
 prost = { version = "0.11.6", default-features = false}
-criterion = { version = "0.7.0", features = ["async_tokio"] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winbase"] }
@@ -115,6 +114,7 @@ lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
 #lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
 proptest = "1.0.0"
 regex = "1.5.6"
+criterion = { version = "0.7.0", features = ["async_tokio"] }
 
 [target.'cfg(not(no_download))'.dev-dependencies]
 electrsd = { version = "0.35.0", default-features = false, features = ["legacy", "esplora_a33e97e1", "corepc-node_27_2"] }

tests/common/mod.rs

@@ -410,21 +410,14 @@ pub(crate) fn setup_node_for_async_payments(
 
 	builder.set_async_payments_role(async_payments_role).unwrap();
 
-	let kv_store: Arc<DynStore> = match config.store_type {
+	let node = match config.store_type {
 		TestStoreType::TestSyncStore => {
-			Arc::new(TestSyncStore::new(config.node_config.storage_dir_path.into()))
+			let kv_store = Arc::new(TestSyncStore::new(config.node_config.storage_dir_path.into()));
+			builder.build_with_store(kv_store).unwrap()
 		},
-		TestStoreType::Sqlite => Arc::new(
-			SqliteStore::new(
-				config.node_config.storage_dir_path.into(),
-				Some(SQLITE_DB_FILE_NAME.to_string()),
-				Some(KV_TABLE_NAME.to_string()),
-			)
-			.unwrap(),
-		),
+		TestStoreType::Sqlite => builder.build().unwrap(),
 	};
 
-	let node = builder.build_with_store(kv_store).unwrap();
 	node.start().unwrap();
 	assert!(node.status().is_running);
 	assert!(node.status().latest_fee_rate_cache_update_timestamp.is_some());