From a348dbdcfe2fa9abc92eab7286dde1177fef65bd Mon Sep 17 00:00:00 2001 From: Alekos Filini Date: Thu, 21 Oct 2021 18:35:03 +0200 Subject: [PATCH] [ci] Update the stable version to 1.56 --- .github/workflows/cont_integration.yml | 4 ++-- examples/compiler.rs | 2 +- src/blockchain/compact_filters/mod.rs | 6 +++--- src/blockchain/compact_filters/peer.rs | 4 ++-- src/blockchain/compact_filters/store.rs | 4 ++-- src/blockchain/compact_filters/sync.rs | 2 +- src/blockchain/rpc.rs | 8 ++++---- src/keys/bip39.rs | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 992b7ab3..09087a00 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: rust: - - 1.53.0 # STABLE + - 1.56.0 # STABLE - 1.46.0 # MSRV features: - default @@ -135,7 +135,7 @@ jobs: - run: sudo apt-get update || exit 1 - run: sudo apt-get install -y libclang-common-10-dev clang-10 libc6-dev-i386 || exit 1 - name: Set default toolchain - run: rustup default 1.53.0 # STABLE + run: rustup default 1.56.0 # STABLE - name: Set profile run: rustup set profile minimal - name: Add target wasm32 diff --git a/examples/compiler.rs b/examples/compiler.rs index e1af0211..0af034cb 100644 --- a/examples/compiler.rs +++ b/examples/compiler.rs @@ -70,7 +70,7 @@ fn main() -> Result<(), Box> { let policy_str = matches.value_of("POLICY").unwrap(); info!("Compiling policy: {}", policy_str); - let policy = Concrete::::from_str(&policy_str)?; + let policy = Concrete::::from_str(policy_str)?; let descriptor = match matches.value_of("TYPE").unwrap() { "sh" => Descriptor::new_sh(policy.compile()?)?, diff --git a/src/blockchain/compact_filters/mod.rs b/src/blockchain/compact_filters/mod.rs index e057d162..b513d378 100644 --- a/src/blockchain/compact_filters/mod.rs +++ b/src/blockchain/compact_filters/mod.rs @@ -254,7 +254,7 @@ impl Blockchain for CompactFiltersBlockchain { let total_cost = headers_cost + filters_cost + PROCESS_BLOCKS_COST; if let Some(snapshot) = sync::sync_headers( - Arc::clone(&first_peer), + Arc::clone(first_peer), Arc::clone(&self.headers), |new_height| { let local_headers_cost = @@ -275,7 +275,7 @@ impl Blockchain for CompactFiltersBlockchain { let buried_height = synced_height.saturating_sub(sync::BURIED_CONFIRMATIONS); info!("Synced headers to height: {}", synced_height); - cf_sync.prepare_sync(Arc::clone(&first_peer))?; + cf_sync.prepare_sync(Arc::clone(first_peer))?; let all_scripts = Arc::new( database @@ -294,7 +294,7 @@ impl Blockchain for CompactFiltersBlockchain { let mut threads = Vec::with_capacity(self.peers.len()); for peer in &self.peers { let cf_sync = Arc::clone(&cf_sync); - let peer = Arc::clone(&peer); + let peer = Arc::clone(peer); let headers = Arc::clone(&self.headers); let all_scripts = Arc::clone(&all_scripts); let last_synced_block = Arc::clone(&last_synced_block); diff --git a/src/blockchain/compact_filters/peer.rs b/src/blockchain/compact_filters/peer.rs index 683e25db..f415d285 100644 --- a/src/blockchain/compact_filters/peer.rs +++ b/src/blockchain/compact_filters/peer.rs @@ -262,7 +262,7 @@ impl Peer { let message_resp = { let mut lock = responses.write().unwrap(); let message_resp = lock.entry(wait_for).or_default(); - Arc::clone(&message_resp) + Arc::clone(message_resp) }; let (lock, cvar) = &*message_resp; @@ -379,7 +379,7 @@ impl Peer { let message_resp = { let mut lock = reader_thread_responses.write().unwrap(); let message_resp = lock.entry(in_message.cmd()).or_default(); - Arc::clone(&message_resp) + Arc::clone(message_resp) }; let (lock, cvar) = &*message_resp; diff --git a/src/blockchain/compact_filters/store.rs b/src/blockchain/compact_filters/store.rs index da30368e..e2564086 100644 --- a/src/blockchain/compact_filters/store.rs +++ b/src/blockchain/compact_filters/store.rs @@ -760,7 +760,7 @@ impl CfStore { let cf_headers: Vec = filter_hashes .into_iter() .scan(checkpoint, |prev_header, filter_hash| { - let filter_header = filter_hash.filter_header(&prev_header); + let filter_header = filter_hash.filter_header(prev_header); *prev_header = filter_header; Some(filter_header) @@ -801,7 +801,7 @@ impl CfStore { .zip(headers.into_iter()) .scan(checkpoint, |prev_header, ((_, filter_content), header)| { let filter = BlockFilter::new(&filter_content); - if header != filter.filter_header(&prev_header) { + if header != filter.filter_header(prev_header) { return Some(Err(CompactFiltersError::InvalidFilter)); } *prev_header = header; diff --git a/src/blockchain/compact_filters/sync.rs b/src/blockchain/compact_filters/sync.rs index 11bdf4dc..b12268dd 100644 --- a/src/blockchain/compact_filters/sync.rs +++ b/src/blockchain/compact_filters/sync.rs @@ -205,7 +205,7 @@ impl CfSync { let block_hash = self.headers_store.get_block_hash(height)?.unwrap(); // TODO: also download random blocks? - if process(&block_hash, &BlockFilter::new(&filter))? { + if process(&block_hash, &BlockFilter::new(filter))? { log::debug!("Downloading block {}", block_hash); let block = peer diff --git a/src/blockchain/rpc.rs b/src/blockchain/rpc.rs index e88dda45..6d1d94d0 100644 --- a/src/blockchain/rpc.rs +++ b/src/blockchain/rpc.rs @@ -156,7 +156,7 @@ impl Blockchain for RpcBlockchain { .iter() .map(|s| ImportMultiRequest { timestamp: ImportMultiRescanSince::Timestamp(0), - script_pubkey: Some(ImportMultiRequestScriptPubkey::Script(&s)), + script_pubkey: Some(ImportMultiRequestScriptPubkey::Script(s)), watchonly: Some(true), ..Default::default() }) @@ -238,7 +238,7 @@ impl Blockchain for RpcBlockchain { txid, confirmation_time ); known_tx.confirmation_time = confirmation_time; - db.set_tx(&known_tx)?; + db.set_tx(known_tx)?; } } else { //TODO check there is already the raw tx in db? @@ -427,13 +427,13 @@ where { //TODO check descriptors contains only public keys let descriptor = descriptor - .into_wallet_descriptor(&secp, network)? + .into_wallet_descriptor(secp, network)? .0 .to_string(); let mut wallet_name = get_checksum(&descriptor[..descriptor.find('#').unwrap()])?; if let Some(change_descriptor) = change_descriptor { let change_descriptor = change_descriptor - .into_wallet_descriptor(&secp, network)? + .into_wallet_descriptor(secp, network)? .0 .to_string(); wallet_name.push_str( diff --git a/src/keys/bip39.rs b/src/keys/bip39.rs index fbd6231f..c12da624 100644 --- a/src/keys/bip39.rs +++ b/src/keys/bip39.rs @@ -40,7 +40,7 @@ pub type MnemonicWithPassphrase = (Mnemonic, Option); #[cfg_attr(docsrs, doc(cfg(feature = "keys-bip39")))] impl DerivableKey for Seed { fn into_extended_key(self) -> Result, KeyError> { - Ok(bip32::ExtendedPrivKey::new_master(Network::Bitcoin, &self.as_bytes())?.into()) + Ok(bip32::ExtendedPrivKey::new_master(Network::Bitcoin, self.as_bytes())?.into()) } fn into_descriptor_key(