mix node conf multi and rocks

polkadot/node/metrics/src/tests.rs

@@ -27,7 +27,7 @@ const DEFAULT_PROMETHEUS_PORT: u16 = 9616;
 #[tokio::test(flavor = "multi_thread")]
 async fn runtime_can_publish_metrics() {
 	let mut alice_config =
-		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true);
+		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true, true);
 
 	// Enable Prometheus metrics for Alice.
 	alice_config.prometheus_config = Some(test_prometheus_config(DEFAULT_PROMETHEUS_PORT));
@@ -46,7 +46,7 @@ async fn runtime_can_publish_metrics() {
 	let alice = run_validator_node(alice_config, None);
 
 	let bob_config =
-		node_config(|| {}, tokio::runtime::Handle::current(), Bob, vec![alice.addr.clone()], true);
+		node_config(|| {}, tokio::runtime::Handle::current(), Bob, vec![alice.addr.clone()], true, false);
 
 	// Start validator Bob.
 	let _bob = run_validator_node(bob_config, None);

polkadot/node/test/service/src/lib.rs

@@ -158,6 +158,7 @@ pub fn node_config(
 	key: Sr25519Keyring,
 	boot_nodes: Vec<MultiaddrWithPeerId>,
 	is_validator: bool,
+	multi_tree: bool,
 ) -> Configuration {
 	let base_path = BasePath::new_temp_dir().expect("could not create temporary directory");
 	let root = base_path.path().join(key.to_string());
@@ -195,9 +196,11 @@ pub fn node_config(
 		transaction_pool: Default::default(),
 		network: network_config,
 		keystore: KeystoreConfig::InMemory,
-		//database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 }, // TODO
-		// restore rocksdb?
-		database: DatabaseSource::ParityDb { path: root.join("db"), multi_tree: true },
+		database: if multi_tree {
+			DatabaseSource::ParityDb { path: root.join("db"), multi_tree: true }
+		} else {
+			DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 }
+		},
 		trie_cache_maximum_size: Some(64 * 1024 * 1024),
 		state_pruning: Default::default(),
 		blocks_pruning: BlocksPruning::KeepFinalized,
@@ -276,7 +279,7 @@ pub fn run_collator_node(
 	boot_nodes: Vec<MultiaddrWithPeerId>,
 	collator_pair: CollatorPair,
 ) -> PolkadotTestNode {
-	let config = node_config(storage_update_func, tokio_handle, key, boot_nodes, false);
+	let config = node_config(storage_update_func, tokio_handle, key, boot_nodes, false, false);
 	let multiaddr = config.network.listen_addresses[0].clone();
 	let NewFull { task_manager, client, network, rpc_handlers, overseer_handle, .. } = new_full(
 		config,

polkadot/node/test/service/tests/build-blocks.rs

@@ -29,6 +29,7 @@ async fn ensure_test_service_build_blocks() {
 		Sr25519Keyring::Alice,
 		Vec::new(),
 		true,
+		false,
 	);
 	let mut alice = run_validator_node(alice_config, None);
 
@@ -38,6 +39,7 @@ async fn ensure_test_service_build_blocks() {
 		Sr25519Keyring::Bob,
 		vec![alice.addr.clone()],
 		true,
+		true,
 	);
 	let mut bob = run_validator_node(bob_config, None);
 

polkadot/node/test/service/tests/call-function.rs

@@ -20,7 +20,7 @@ use sp_keyring::Sr25519Keyring::{Alice, Bob, Charlie};
 #[tokio::test(flavor = "multi_thread")]
 async fn call_function_actually_work() {
 	let alice_config =
-		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true);
+		node_config(|| {}, tokio::runtime::Handle::current(), Alice, Vec::new(), true, false);
 
 	let alice = run_validator_node(alice_config, None);
 

polkadot/parachain/test-parachains/adder/collator/tests/integration.rs

@@ -37,6 +37,7 @@ async fn collating_using_adder_collator() {
 		Alice,
 		Vec::new(),
 		true,
+		false,
 	);
 
 	let mut workers_path = std::env::current_exe().unwrap();
@@ -52,6 +53,7 @@ async fn collating_using_adder_collator() {
 		Bob,
 		vec![alice.addr.clone()],
 		true,
+		true,
 	);
 
 	// start bob

polkadot/parachain/test-parachains/undying/collator/tests/integration.rs

@@ -36,6 +36,7 @@ async fn collating_using_undying_collator() {
 		Alice,
 		Vec::new(),
 		true,
+		false,
 	);
 
 	let mut workers_path = std::env::current_exe().unwrap();
@@ -51,6 +52,7 @@ async fn collating_using_undying_collator() {
 		Bob,
 		vec![alice.addr.clone()],
 		true,
+		true,
 	);
 
 	// start bob