From cc4c842df3e48e2c92161eac5c0a4c97ea0b31d8 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Fri, 9 May 2025 09:40:32 +1000 Subject: [PATCH 1/2] Add missing newlines Whitespace only, no code changes. --- client/src/client_sync/v23/blockchain.rs | 1 + types/src/v23/blockchain.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/client/src/client_sync/v23/blockchain.rs b/client/src/client_sync/v23/blockchain.rs index 0d7c004a..e7855ec0 100644 --- a/client/src/client_sync/v23/blockchain.rs +++ b/client/src/client_sync/v23/blockchain.rs @@ -8,6 +8,7 @@ //! All macros require `Client` to be in scope. //! //! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`. + /// Implements Bitcoin Core JSON-RPC API method `savemempool` #[macro_export] macro_rules! impl_client_v23__savemempool { diff --git a/types/src/v23/blockchain.rs b/types/src/v23/blockchain.rs index 284df8dd..8735bbcf 100644 --- a/types/src/v23/blockchain.rs +++ b/types/src/v23/blockchain.rs @@ -3,6 +3,7 @@ //! The JSON-RPC API for Bitcoin Core `v23` - blockchain. //! //! Types for methods found under the `== Blockchain ==` section of the API docs. + use serde::{Deserialize, Serialize}; /// Result of JSON-RPC method `savemempool`. From e7b06a37f7b94dd640b30467e888f6cf13c350ac Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Fri, 9 May 2025 09:43:20 +1000 Subject: [PATCH 2/2] integration_test: Use version alias We have alias for the exact versions in the integration tests because they are more terse with no loss of clarity. --- integration_test/tests/blockchain.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/integration_test/tests/blockchain.rs b/integration_test/tests/blockchain.rs index 36f8c329..7d4a0100 100644 --- a/integration_test/tests/blockchain.rs +++ b/integration_test/tests/blockchain.rs @@ -283,24 +283,24 @@ fn blockchain__savemempool() { let (_addr, _txid) = node.create_mempool_transaction(); #[cfg(any( - feature = "0_17_2", - feature = "0_18_1", - feature = "0_19_1", - feature = "0_20_2", - feature = "0_21_2", - feature = "22_1" + feature = "v17", + feature = "v18", + feature = "v19", + feature = "v20", + feature = "v21", + feature = "v22", ))] { node.client.save_mempool().expect("savemempool"); } #[cfg(not(any( - feature = "0_17_2", - feature = "0_18_1", - feature = "0_19_1", - feature = "0_20_2", - feature = "0_21_2", - feature = "22_1" + feature = "v17", + feature = "v18", + feature = "v19", + feature = "v20", + feature = "v21", + feature = "v22", )))] { let _: Result = node.client.save_mempool();