Skip to content

Commit 7d0db23

Browse files
committed
Format code
1 parent 22d3d22 commit 7d0db23

File tree

18 files changed

+99
-103
lines changed

18 files changed

+99
-103
lines changed

client/src/client_sync/v17/blockchain.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,10 @@ macro_rules! impl_client_v17__scan_tx_out_set {
329329
}
330330

331331
/// Starts a scan of the UTXO set for specified descriptors.
332-
pub fn scan_tx_out_set_start(&self, scan_objects: &[&str]) -> Result<ScanTxOutSetStart> {
332+
pub fn scan_tx_out_set_start(
333+
&self,
334+
scan_objects: &[&str],
335+
) -> Result<ScanTxOutSetStart> {
333336
self.call("scantxoutset", &[into_json("start")?, into_json(scan_objects)?])
334337
}
335338

types/src/model/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ pub use self::{
2828
GetDescriptorActivity, GetDifficulty, GetMempoolAncestors, GetMempoolAncestorsVerbose,
2929
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
3030
GetRawMempool, GetRawMempoolVerbose, GetTxOut, GetTxOutSetInfo, MempoolEntry,
31-
MempoolEntryFees, ReceiveActivity, ScanTxOutSetStart,
32-
ScanTxOutSetUnspent, Softfork, SoftforkType, SpendActivity, VerifyTxOutProof,
31+
MempoolEntryFees, ReceiveActivity, ScanTxOutSetStart, ScanTxOutSetUnspent, Softfork,
32+
SoftforkType, SpendActivity, VerifyTxOutProof,
3333
},
3434
generating::{Generate, GenerateBlock, GenerateToAddress, GenerateToDescriptor},
3535
mining::{

types/src/v17/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ pub use self::{
243243
GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo, GetMempoolInfoError,
244244
GetRawMempool, GetRawMempoolVerbose, GetTxOut, GetTxOutError, GetTxOutSetInfo,
245245
GetTxOutSetInfoError, MapMempoolEntryError, MempoolEntry, MempoolEntryError,
246-
MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, ScanTxOutSetAbort, ScanTxOutSetError,
247-
ScanTxOutSetStart, ScanTxOutSetStatus, ScanTxOutSetUnspent, Softfork, SoftforkReject,
248-
VerifyChain, VerifyTxOutProof,
246+
MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, ScanTxOutSetAbort,
247+
ScanTxOutSetError, ScanTxOutSetStart, ScanTxOutSetStatus, ScanTxOutSetUnspent, Softfork,
248+
SoftforkReject, VerifyChain, VerifyTxOutProof,
249249
},
250250
control::{GetMemoryInfoStats, Locked, Logging},
251251
generating::{Generate, GenerateToAddress},

types/src/v18/blockchain/into.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use bitcoin::{Amount, ScriptBuf, Txid, Wtxid};
44

55
use super::{
6-
GetMempoolEntry, MempoolEntry, MempoolEntryError, ScanTxOutSetError,
7-
ScanTxOutSetStart, ScanTxOutSetUnspent,
6+
GetMempoolEntry, MempoolEntry, MempoolEntryError, ScanTxOutSetError, ScanTxOutSetStart,
7+
ScanTxOutSetUnspent,
88
};
99
use crate::model;
1010

types/src/v18/mod.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,7 @@ mod wallet;
233233

234234
#[doc(inline)]
235235
pub use self::{
236-
blockchain::{
237-
GetMempoolEntry, MempoolEntry, ScanTxOutSetStart,
238-
ScanTxOutSetUnspent,
239-
},
236+
blockchain::{GetMempoolEntry, MempoolEntry, ScanTxOutSetStart, ScanTxOutSetUnspent},
240237
control::{ActiveCommand, GetRpcInfo},
241238
network::{GetNodeAddresses, GetPeerInfo, NodeAddress, PeerInfo},
242239
raw_transactions::{
@@ -281,10 +278,10 @@ pub use crate::v17::{
281278
Logging, MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees,
282279
MempoolEntryFeesError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction,
283280
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain,
284-
ScanTxOutSetError, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee,
285-
SignFail, SignFailError, SignMessage, SignMessageWithPrivKey, SignRawTransaction,
286-
SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory,
287-
UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
288-
VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
289-
WitnessUtxo, ScanTxOutSetAbort, ScanTxOutSetStatus,
281+
ScanTxOutSetAbort, ScanTxOutSetError, ScanTxOutSetStatus, SendMany, SendRawTransaction,
282+
SendToAddress, SetNetworkActive, SetTxFee, SignFail, SignFailError, SignMessage,
283+
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, Softfork, SoftforkReject,
284+
TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError,
285+
VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt,
286+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
290287
};

types/src/v19/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,12 @@ pub use crate::v17::{
276276
ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions,
277277
ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet,
278278
LockUnspent, Locked, Logging, PruneBlockchain, RawTransactionError, RawTransactionInput,
279-
RawTransactionOutput, RescanBlockchain, ScanTxOutSetError, SendMany, SendRawTransaction,
280-
SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
281-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
282-
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
283-
VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
284-
WalletProcessPsbt, WitnessUtxo, ScanTxOutSetAbort, ScanTxOutSetStatus,
279+
RawTransactionOutput, RescanBlockchain, ScanTxOutSetAbort, ScanTxOutSetError,
280+
ScanTxOutSetStatus, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee,
281+
SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
282+
SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress,
283+
ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt,
284+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
285285
};
286286
#[doc(inline)]
287287
pub use crate::v18::{

types/src/v20/mod.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@ pub use crate::{
268268
ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions,
269269
ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets,
270270
LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput,
271-
RawTransactionOutput, RescanBlockchain, ScanTxOutSetError, SendMany, SendRawTransaction,
272-
SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
273-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
274-
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
275-
VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
276-
WalletProcessPsbt, WitnessUtxo, ScanTxOutSetAbort, ScanTxOutSetStatus,
271+
RawTransactionOutput, RescanBlockchain, ScanTxOutSetAbort, ScanTxOutSetError,
272+
ScanTxOutSetStatus, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive,
273+
SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
274+
SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress,
275+
ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt,
276+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
277277
},
278278
v18::{
279279
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,
@@ -289,6 +289,7 @@ pub use crate::{
289289
GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
290290
GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo, GetNetworkInfo, GetPeerInfo,
291291
GetRpcInfo, MapMempoolEntryError, MempoolEntry, MempoolEntryError, MempoolEntryFees,
292-
MempoolEntryFeesError, PeerInfo, ScanTxOutSetStart, ScanTxOutSetUnspent, SetWalletFlag, Softfork, SoftforkType,
292+
MempoolEntryFeesError, PeerInfo, ScanTxOutSetStart, ScanTxOutSetUnspent, SetWalletFlag,
293+
Softfork, SoftforkType,
293294
},
294295
};

types/src/v21/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,12 @@ pub use crate::{
280280
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
281281
ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent,
282282
Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput,
283-
RescanBlockchain, ScanTxOutSetError, SendMany, SendRawTransaction, SendToAddress,
284-
SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction,
285-
SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory,
286-
UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
287-
VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
288-
WitnessUtxo, ScanTxOutSetAbort, ScanTxOutSetStatus,
283+
RescanBlockchain, ScanTxOutSetAbort, ScanTxOutSetError, ScanTxOutSetStatus, SendMany,
284+
SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
285+
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject,
286+
TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress,
287+
ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt,
288+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
289289
},
290290
v18::{
291291
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

types/src/v22/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,12 @@ pub use crate::{
286286
ListSinceBlockTransaction, ListSinceBlockTransactionError, ListTransactions,
287287
ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError, ListWallets,
288288
LoadWallet, LockUnspent, Locked, PruneBlockchain, RawTransactionError, RawTransactionInput,
289-
RawTransactionOutput, RescanBlockchain, ScanTxOutSetError, SendMany, SendRawTransaction,
290-
SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
291-
SignRawTransaction, SignRawTransactionError, SoftforkReject, TestMempoolAccept,
292-
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
293-
VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
294-
WalletProcessPsbt, WitnessUtxo, ScanTxOutSetAbort, ScanTxOutSetStatus,
289+
RawTransactionOutput, RescanBlockchain, ScanTxOutSetAbort, ScanTxOutSetError,
290+
ScanTxOutSetStatus, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive,
291+
SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
292+
SoftforkReject, TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress,
293+
ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt,
294+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
295295
},
296296
v18::{
297297
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

types/src/v23/mod.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@ pub use crate::{
282282
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
283283
ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent,
284284
Locked, PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput,
285-
RescanBlockchain, ScanTxOutSetError, SendMany, SendRawTransaction, SendToAddress,
286-
SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction,
287-
SignRawTransactionError, SoftforkReject, TestMempoolAccept, TransactionCategory,
288-
UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
289-
VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
290-
WitnessUtxo, ScanTxOutSetAbort, ScanTxOutSetStatus,
285+
RescanBlockchain, ScanTxOutSetAbort, ScanTxOutSetError, ScanTxOutSetStatus, SendMany,
286+
SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
287+
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SoftforkReject,
288+
TestMempoolAccept, TransactionCategory, UploadTarget, ValidateAddress,
289+
ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WalletCreateFundedPsbt,
290+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
291291
},
292292
v18::{
293293
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,
@@ -302,9 +302,8 @@ pub use crate::{
302302
GetBlockFilterError, GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo,
303303
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
304304
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError, MempoolEntry,
305-
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo,
306-
ScanTxOutSetStart, ScanTxOutSetUnspent, SetWalletFlag, Softfork,
307-
SoftforkType,
305+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PeerInfo, ScanTxOutSetStart,
306+
ScanTxOutSetUnspent, SetWalletFlag, Softfork, SoftforkType,
308307
},
309308
v20::{GenerateToDescriptor, GetTransactionDetail},
310309
v21::{

0 commit comments

Comments
 (0)