From 57ea47b5c66132cc3f211f492984515672fe5dd5 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Tue, 22 Nov 2022 08:17:27 -0800 Subject: [PATCH 1/3] Bump CI stable version to 1.65.0 --- .github/workflows/cont_integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 190bae292..f6d81ed5e 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: rust: - - version: 1.60.0 # STABLE + - version: 1.65.0 # STABLE clippy: true - version: 1.56.1 # MSRV features: From 8cb474a8a523bf33641ee08f44961418ceb48872 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Tue, 22 Nov 2022 08:56:07 -0800 Subject: [PATCH 2/3] Fix clippy lint partialeq_to_none https://rust-lang.github.io/rust-clippy/master/index.html#partialeq_to_none --- src/descriptor/policy.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/descriptor/policy.rs b/src/descriptor/policy.rs index 964ec2911..581c7b9db 100644 --- a/src/descriptor/policy.rs +++ b/src/descriptor/policy.rs @@ -1197,7 +1197,7 @@ mod test { assert!(matches!(&policy.item, EcdsaSignature(PkOrF::Fingerprint(f)) if f == &fingerprint)); assert!( - matches!(&policy.contribution, Satisfaction::Complete {condition} if condition.csv == None && condition.timelock == None) + matches!(&policy.contribution, Satisfaction::Complete {condition} if condition.csv.is_none() && condition.timelock.is_none()) ); } @@ -1360,7 +1360,7 @@ mod test { assert!(matches!(policy.item, EcdsaSignature(PkOrF::Fingerprint(f)) if f == fingerprint)); assert!( - matches!(policy.contribution, Satisfaction::Complete {condition} if condition.csv == None && condition.timelock == None) + matches!(policy.contribution, Satisfaction::Complete {condition} if condition.csv.is_none() && condition.timelock.is_none()) ); } From 62d0314fb7a38ed3a1bbf4668cddca4d5e523043 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Tue, 22 Nov 2022 08:58:32 -0800 Subject: [PATCH 3/3] Allow clippy lint await_holding_refcell_ref. This needs to be fixed in bdk_core 1.0. https://rust-lang.github.io/rust-clippy/master/index.html#await_holding_refcell_ref --- src/wallet/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs index c400c5a4d..bf0f92f49 100644 --- a/src/wallet/mod.rs +++ b/src/wallet/mod.rs @@ -1686,6 +1686,7 @@ where } /// Sync the internal database with the blockchain + #[allow(clippy::await_holding_refcell_ref)] // TODO this will be fixed in bdk 1.0 #[maybe_async] pub fn sync( &self,