Skip to content

Commit dc0122e

Browse files
tchardingtcharding
committed
Merge #132: Implement pruneblock method and test
bbcec24 Implement pruneblock method and test (GideonBature) Pull request description: Going by the conversations with tcharding for PR #116 on implementing one method at a time for easier review: This is the first method implementation `pruneblockchain` which is a specific type that returns a standard type (numeric). Once this is approved, I’ll proceed with the remaining ones. ACKs for top commit: tcharding: ACK bbcec24 Tree-SHA512: 93b6dad6db42e6dad2c0e229553cc415f1d6c8b150dfda092f243b5ff61c7f8932878ee12d330915ca19e3b482c40d546c291692dad14980d9ac92e492f3dfbd
2 parents 57348fa + bbcec24 commit dc0122e

File tree

40 files changed

+113
-57
lines changed

40 files changed

+113
-57
lines changed

‎client/src/client_sync/v17/blockchain.rs

+13
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,19 @@ macro_rules! impl_client_v17__preciousblock {
289289
};
290290
}
291291

292+
/// Implements Bitcoin Core JSON-RPC API method `pruneblockchain`
293+
#[macro_export]
294+
macro_rules! impl_client_v17__pruneblockchain {
295+
() => {
296+
impl Client {
297+
/// Instructs the node to prune the blockchain up to a specified height or timestamp.
298+
pub fn prune_blockchain(&self, target: u64) -> Result<PruneBlockchain> {
299+
self.call("pruneblockchain", &[target.into()])
300+
}
301+
}
302+
};
303+
}
304+
292305
/// Implements Bitcoin Core JSON-RPC API method `verifytxoutproof`
293306
#[macro_export]
294307
macro_rules! impl_client_v17__verifytxoutproof {

‎client/src/client_sync/v17/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ crate::impl_client_v17__gettxout!();
4848
crate::impl_client_v17__gettxoutproof!();
4949
crate::impl_client_v17__gettxoutsetinfo!();
5050
crate::impl_client_v17__preciousblock!();
51+
crate::impl_client_v17__pruneblockchain!();
5152
crate::impl_client_v17__verifytxoutproof!();
5253

5354
// == Control ==

‎client/src/client_sync/v18/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ crate::impl_client_v17__gettxout!();
4242
crate::impl_client_v17__gettxoutproof!();
4343
crate::impl_client_v17__gettxoutsetinfo!();
4444
crate::impl_client_v17__preciousblock!();
45+
crate::impl_client_v17__pruneblockchain!();
4546
crate::impl_client_v17__verifytxoutproof!();
4647

4748
// == Control ==

‎client/src/client_sync/v19/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ crate::impl_client_v17__gettxout!();
4343
crate::impl_client_v17__gettxoutproof!();
4444
crate::impl_client_v17__gettxoutsetinfo!();
4545
crate::impl_client_v17__preciousblock!();
46+
crate::impl_client_v17__pruneblockchain!();
4647
crate::impl_client_v17__verifytxoutproof!();
4748

4849
// == Control ==

‎client/src/client_sync/v20.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ crate::impl_client_v17__gettxout!();
4040
crate::impl_client_v17__gettxoutproof!();
4141
crate::impl_client_v17__gettxoutsetinfo!();
4242
crate::impl_client_v17__preciousblock!();
43+
crate::impl_client_v17__pruneblockchain!();
4344
crate::impl_client_v17__verifytxoutproof!();
4445

4546
// == Control ==

‎client/src/client_sync/v21/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ crate::impl_client_v17__gettxout!();
4242
crate::impl_client_v17__gettxoutproof!();
4343
crate::impl_client_v17__gettxoutsetinfo!();
4444
crate::impl_client_v17__preciousblock!();
45+
crate::impl_client_v17__pruneblockchain!();
4546
crate::impl_client_v17__verifytxoutproof!();
4647

4748
// == Control ==

‎client/src/client_sync/v22/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ crate::impl_client_v22__gettxout!();
4343
crate::impl_client_v17__gettxoutproof!();
4444
crate::impl_client_v17__gettxoutsetinfo!();
4545
crate::impl_client_v17__preciousblock!();
46+
crate::impl_client_v17__pruneblockchain!();
4647
crate::impl_client_v17__verifytxoutproof!();
4748

4849
// == Control ==

‎client/src/client_sync/v23/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ crate::impl_client_v22__gettxout!();
4343
crate::impl_client_v17__gettxoutproof!();
4444
crate::impl_client_v17__gettxoutsetinfo!();
4545
crate::impl_client_v17__preciousblock!();
46+
crate::impl_client_v17__pruneblockchain!();
4647
crate::impl_client_v17__verifytxoutproof!();
4748

4849
// == Control ==

‎client/src/client_sync/v24.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ crate::impl_client_v22__gettxout!();
4040
crate::impl_client_v17__gettxoutproof!();
4141
crate::impl_client_v17__gettxoutsetinfo!();
4242
crate::impl_client_v17__preciousblock!();
43+
crate::impl_client_v17__pruneblockchain!();
4344
crate::impl_client_v17__verifytxoutproof!();
4445

4546
// == Control ==

‎client/src/client_sync/v25.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ crate::impl_client_v22__gettxout!();
4040
crate::impl_client_v17__gettxoutproof!();
4141
crate::impl_client_v17__gettxoutsetinfo!();
4242
crate::impl_client_v17__preciousblock!();
43+
crate::impl_client_v17__pruneblockchain!();
4344
crate::impl_client_v17__verifytxoutproof!();
4445

4546
// == Control ==

‎client/src/client_sync/v26/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ crate::impl_client_v22__gettxout!();
4444
crate::impl_client_v17__gettxoutproof!();
4545
crate::impl_client_v26__gettxoutsetinfo!();
4646
crate::impl_client_v17__preciousblock!();
47+
crate::impl_client_v17__pruneblockchain!();
4748
crate::impl_client_v17__verifytxoutproof!();
4849

4950
// == Control ==

‎client/src/client_sync/v27.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ crate::impl_client_v22__gettxout!();
4040
crate::impl_client_v17__gettxoutproof!();
4141
crate::impl_client_v26__gettxoutsetinfo!();
4242
crate::impl_client_v17__preciousblock!();
43+
crate::impl_client_v17__pruneblockchain!();
4344
crate::impl_client_v17__verifytxoutproof!();
4445

4546
// == Control ==

‎client/src/client_sync/v28/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ crate::impl_client_v22__gettxout!();
4242
crate::impl_client_v17__gettxoutproof!();
4343
crate::impl_client_v26__gettxoutsetinfo!();
4444
crate::impl_client_v17__preciousblock!();
45+
crate::impl_client_v17__pruneblockchain!();
4546
crate::impl_client_v17__verifytxoutproof!();
4647

4748
// == Control ==

‎integration_test/tests/blockchain.rs

+15
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,21 @@ fn blockchain__precious_block() {
261261
let _ = node.client.precious_block(hash).expect("preciousblock");
262262
}
263263

264+
#[test]
265+
fn blockchain__prune_blockchain() {
266+
const NBLOCKS: usize = 1;
267+
268+
let node = Node::with_wallet(Wallet::Default, &["-prune=550"]);
269+
let address = node.client.new_address().expect("Failed to get new address");
270+
271+
let gen_result = node.client.generate_to_address(NBLOCKS, &address).expect("generate_to_address RPC call failed");
272+
assert_eq!(gen_result.0.len(), NBLOCKS, "generate_to_address did not return the expected number of block hashes");
273+
274+
let target_height: u64 = 500;
275+
276+
let _: Result<PruneBlockchain, _> = node.client.prune_blockchain(target_height);
277+
}
278+
264279
#[test]
265280
fn blockchain__verify_tx_out_proof__modelled() {
266281
let node = Node::with_wallet(Wallet::Default, &[]);

‎integration_test/tests/wallet.rs

-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ fn wallet__get_balance__modelled() {
169169
json.into_model().unwrap();
170170
}
171171

172-
173172
#[test]
174173
#[cfg(all(not(feature = "v17"), not(feature = "v18")))]
175174
fn wallet__get_balances() {

‎types/src/v17/blockchain/mod.rs

+13
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,19 @@ pub struct GetTxOutSetInfo {
637637
pub total_amount: f64,
638638
}
639639

640+
/// Result of JSON-RPC method `pruneblockchain`.
641+
///
642+
/// > pruneblockchain height
643+
/// >
644+
/// > Arguments:
645+
/// > 1. "height" (numeric, required) The block height to prune up to. May be set to a discrete height, or a unix timestamp
646+
/// > to prune blocks whose block time is at least 2 hours older than the provided timestamp.
647+
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
648+
pub struct PruneBlockchain(
649+
/// The height of the last block pruned.
650+
pub i64,
651+
);
652+
640653
/// Result of JSON-RPC method `verifytxoutproof`.
641654
///
642655
/// > verifytxoutproof "proof"

‎types/src/v17/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ pub use self::{
243243
GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo, GetMempoolInfoError,
244244
GetRawMempool, GetRawMempoolVerbose, GetTxOut, GetTxOutError, GetTxOutSetInfo,
245245
GetTxOutSetInfoError, MapMempoolEntryError, MempoolEntry, MempoolEntryError,
246-
MempoolEntryFees, MempoolEntryFeesError, Softfork, SoftforkReject, VerifyTxOutProof,
246+
MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, Softfork, SoftforkReject,
247+
VerifyTxOutProof,
247248
},
248249
control::{GetMemoryInfoStats, Locked, Logging},
249250
generating::{Generate, GenerateToAddress},

‎types/src/v18/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ pub use crate::v17::{
263263
ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspent,
264264
ListUnspentItem, ListUnspentItemError, ListWallets, LoadWallet, Locked, Logging,
265265
MapMempoolEntryError, MempoolAcceptance, MempoolEntry, MempoolEntryError, MempoolEntryFees,
266-
MempoolEntryFeesError, PeerInfo, PsbtInput, PsbtOutput, PsbtScript, RawTransaction,
267-
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany,
268-
SendRawTransaction, SendToAddress, SignFail, SignFailError, SignMessage, SignRawTransaction,
269-
SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory,
270-
UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
271-
WalletProcessPsbt, WitnessUtxo,
266+
MempoolEntryFeesError, PeerInfo, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript,
267+
RawTransaction, RawTransactionError, RawTransactionInput, RawTransactionOutput,
268+
RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SignFail, SignFailError,
269+
SignMessage, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject,
270+
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
271+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
272272
};

‎types/src/v19/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,11 @@ pub use crate::v17::{
265265
ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError,
266266
ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspent,
267267
ListUnspentItem, ListUnspentItemError, ListWallets, LoadWallet, Locked, Logging, PeerInfo,
268-
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany,
269-
SendRawTransaction, SendToAddress, SignMessage, SignRawTransaction, SignRawTransactionError,
270-
SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
271-
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
268+
PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput,
269+
RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SignMessage, SignRawTransaction,
270+
SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget,
271+
VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
272+
WitnessUtxo,
272273
};
273274
#[doc(inline)]
274275
pub use crate::v18::{

‎types/src/v20/mod.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,12 @@ pub use crate::{
257257
ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError,
258258
ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions,
259259
ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem,
260-
ListUnspentItemError, ListWallets, LoadWallet, Locked, PeerInfo, RawTransactionError,
261-
RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction,
262-
SendToAddress, SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
263-
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
264-
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
260+
ListUnspentItemError, ListWallets, LoadWallet, Locked, PeerInfo, PruneBlockchain,
261+
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany,
262+
SendRawTransaction, SendToAddress, SignMessage, SignRawTransaction,
263+
SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory,
264+
UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
265+
WalletProcessPsbt, WitnessUtxo,
265266
},
266267
v18::{
267268
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v21/mod.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,12 @@ pub use crate::{
263263
ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError,
264264
ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions,
265265
ListTransactionsItem, ListTransactionsItemError, ListUnspent, ListUnspentItem,
266-
ListUnspentItemError, ListWallets, LoadWallet, Locked, PeerInfo, RawTransactionError,
267-
RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction,
268-
SendToAddress, SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
269-
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
270-
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
266+
ListUnspentItemError, ListWallets, LoadWallet, Locked, PeerInfo, PruneBlockchain,
267+
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, SendMany,
268+
SendRawTransaction, SendToAddress, SignMessage, SignRawTransaction,
269+
SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory,
270+
UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
271+
WalletProcessPsbt, WitnessUtxo,
271272
},
272273
v18::{
273274
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v22/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ pub use crate::{
278278
ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
279279
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
280280
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
281-
LoadWallet, Locked, PeerInfo, RawTransactionError, RawTransactionInput,
281+
LoadWallet, Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
282282
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
283283
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
284284
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,

‎types/src/v23/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ pub use crate::{
269269
ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
270270
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
271271
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
272-
LoadWallet, Locked, PeerInfo, RawTransactionError, RawTransactionInput,
272+
LoadWallet, Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
273273
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
274274
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
275275
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,

‎types/src/v24/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ pub use crate::{
274274
ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
275275
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
276276
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
277-
LoadWallet, Locked, PeerInfo, RawTransactionError, RawTransactionInput,
277+
LoadWallet, Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
278278
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
279279
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
280280
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,

‎types/src/v25/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ pub use crate::{
271271
ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
272272
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
273273
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
274-
Locked, PeerInfo, RawTransactionError, RawTransactionInput, RawTransactionOutput,
275-
RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SignMessage,
276-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
277-
TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
278-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
274+
Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
275+
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
276+
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
277+
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
278+
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
279279
},
280280
v18::{
281281
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v26/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ pub use crate::{
291291
ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
292292
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
293293
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
294-
Locked, PeerInfo, RawTransactionError, RawTransactionInput, RawTransactionOutput,
295-
RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SignMessage,
296-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
297-
TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
298-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
294+
Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
295+
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
296+
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
297+
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
298+
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
299299
},
300300
v18::{
301301
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v27/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ pub use crate::{
275275
ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
276276
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
277277
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
278-
Locked, PeerInfo, RawTransactionError, RawTransactionInput, RawTransactionOutput,
279-
RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SignMessage,
280-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
281-
TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
282-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
278+
Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
279+
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
280+
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
281+
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
282+
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
283283
},
284284
v18::{
285285
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v28/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,11 @@ pub use crate::{
282282
ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
283283
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
284284
ListTransactionsItemError, ListUnspent, ListUnspentItem, ListUnspentItemError, ListWallets,
285-
Locked, PeerInfo, RawTransactionError, RawTransactionInput, RawTransactionOutput,
286-
RescanBlockchain, SendMany, SendRawTransaction, SendToAddress, SignMessage,
287-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
288-
TransactionCategory, UploadTarget, VerifyTxOutProof, WalletCreateFundedPsbt,
289-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
285+
Locked, PeerInfo, PruneBlockchain, RawTransactionError, RawTransactionInput,
286+
RawTransactionOutput, RescanBlockchain, SendMany, SendRawTransaction, SendToAddress,
287+
SignMessage, SignRawTransaction, SignRawTransactionError, SoftforkReject,
288+
TestMempoolAccept, TransactionCategory, UploadTarget, VerifyTxOutProof,
289+
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
290290
},
291291
v18::{
292292
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎verify/src/method/v17.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub const METHODS: &[Method] = &[
3030
Method::new_string("gettxoutproof", "get_tx_out_proof"),
3131
Method::new_modelled("gettxoutsetinfo", "GetTxOutSetInfo", "get_tx_out_set_info"),
3232
Method::new_nothing("preciousblock", "precious_block"),
33-
Method::new_numeric("pruneblockchain", "prune_blockchain"),
33+
Method::new_no_model("pruneblockchain", "PruneBlockchain", "prune_blockchain"),
3434
Method::new_nothing("savemempool", "save_mempool"),
3535
Method::new_modelled("scantxoutset", "ScanTxOutSet", "scan_tx_out_set"),
3636
Method::new_bool("verifychain", "verify_chain"),

‎verify/src/method/v18.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub const METHODS: &[Method] = &[
3030
Method::new_string("gettxoutproof", "get_tx_out_proof"),
3131
Method::new_modelled("gettxoutsetinfo", "GetTxOutSetInfo", "get_tx_out_set_info"),
3232
Method::new_nothing("preciousblock", "precious_block"),
33-
Method::new_numeric("pruneblockchain", "prune_blockchain"),
33+
Method::new_no_model("pruneblockchain", "PruneBlockchain", "prune_blockchain"),
3434
Method::new_nothing("savemempool", "save_mempool"),
3535
Method::new_modelled("scantxoutset", "ScanTxOutSet", "scan_tx_out_set"),
3636
Method::new_bool("verifychain", "verify_chain"),

0 commit comments

Comments
 (0)