fix(cbf): adapt electrum fee source to latest client

- Pass a Duration to electrum-client timeout configuration.\n- Provide the default fee estimation mode for batched estimate_fee calls.\n- Keep integration test imports ordered after the rebase.

Author: febyeji

src/chain/cbf.rs

@@ -1176,13 +1176,13 @@ impl CbfChainSource {
 			tokio::task::spawn_blocking(move || {
 				let electrum_config = electrum_client::ConfigBuilder::new()
 					.retry(3)
-					.timeout(Some(per_request_timeout))
+					.timeout(Some(Duration::from_secs(per_request_timeout.into())))
 					.build();
 				let client = electrum_client::Client::from_config(&server_url, electrum_config)
 					.map_err(|_| Error::FeerateEstimationUpdateFailed)?;
 				let mut batch = electrum_client::Batch::default();
 				for target in confirmation_targets {
-					batch.estimate_fee(get_num_block_defaults_for_target(target));
+					batch.estimate_fee(get_num_block_defaults_for_target(target), None);
 				}
 				client.batch_call(&batch).map_err(|_| Error::FeerateEstimationUpdateFailed)
 			}),

tests/integration_tests_rust.rs

@@ -24,7 +24,7 @@ use common::{
 	generate_listening_addresses, open_channel, open_channel_push_amt, open_channel_with_all,
 	premine_and_distribute_funds, premine_blocks, prepare_rbf, random_chain_source, random_config,
 	random_listening_addresses, setup_bitcoind_and_electrsd, setup_builder, setup_node,
-	setup_two_nodes, splice_in_with_all, skip_if_cbf, wait_for_cbf_sync, wait_for_tx,
+	setup_two_nodes, skip_if_cbf, splice_in_with_all, wait_for_cbf_sync, wait_for_tx,
 	TestChainSource, TestConfig, TestStoreType, TestSyncStore,
 };
 use electrsd::corepc_node::Node as BitcoinD;