Skip to content

Commit 4814070

Browse files
jamillambert+Sharon
jamillambert
authored and
+Sharon
committed
Run the formatter
Reordering of imports and exports only.
1 parent c9f2706 commit 4814070

File tree

17 files changed

+106
-103
lines changed

17 files changed

+106
-103
lines changed

‎types/src/v18/blockchain/into.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ use alloc::collections::BTreeMap;
44

55
use bitcoin::{hex, Txid, Wtxid};
66

7-
use super::{GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, MempoolEntry, MempoolEntryError, MapMempoolEntryError};
7+
use super::{
8+
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
9+
GetMempoolDescendantsVerbose, GetMempoolEntry, MapMempoolEntryError, MempoolEntry,
10+
MempoolEntryError,
11+
};
812
use crate::model;
913

1014
impl GetMempoolAncestors {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use alloc::collections::BTreeMap;
1010

1111
use serde::{Deserialize, Serialize};
1212

13-
use super::{MempoolEntryError, MempoolEntryFees, MapMempoolEntryError};
13+
use super::{MapMempoolEntryError, MempoolEntryError, MempoolEntryFees};
1414

1515
/// Result of JSON-RPC method `getmempoolancestors` with verbose set to `false`.
1616
///

‎types/src/v18/mod.rs‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,10 @@ mod wallet;
232232

233233
#[doc(inline)]
234234
pub use self::{
235-
blockchain::{GetMempoolEntry, MempoolEntry, GetMempoolAncestors, GetMempoolAncestorsVerbose,
236-
GetMempoolDescendants, GetMempoolDescendantsVerbose,},
235+
blockchain::{
236+
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
237+
GetMempoolDescendantsVerbose, GetMempoolEntry, MempoolEntry,
238+
},
237239
control::{ActiveCommand, GetRpcInfo},
238240
network::{GetNodeAddresses, GetPeerInfo, NodeAddress, PeerInfo},
239241
raw_transactions::{
@@ -261,26 +263,25 @@ pub use crate::v17::{
261263
GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError,
262264
GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError,
263265
GetBlockVerboseZero, GetBlockchainInfo, GetBlockchainInfoError, GetChainTips, GetChainTxStats,
264-
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats,
265-
GetMempoolInfo, GetMempoolInfoError, GetMiningInfo, GetNetTotals,
266-
GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork,
267-
GetNewAddress, GetRawChangeAddress, GetRawMempool, GetRawMempoolVerbose, GetRawTransaction,
268-
GetRawTransactionVerbose, GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction,
269-
GetTransactionDetail, GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError,
270-
GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo,
271-
GetWalletInfoError, GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError,
272-
ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem,
273-
ListLockUnspentItemError, ListReceivedByAddress, ListReceivedByAddressError,
274-
ListReceivedByAddressItem, ListSinceBlock, ListSinceBlockError, ListSinceBlockTransaction,
275-
ListSinceBlockTransactionError, ListTransactions, ListTransactionsItem,
276-
ListTransactionsItemError, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked,
277-
Logging, MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees,
278-
MempoolEntryFeesError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript, RawTransaction,
279-
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType,
280-
SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignFail,
281-
SignFailError, SignMessage, SignMessageWithPrivKey, SignRawTransaction,
282-
SignRawTransactionError, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory,
283-
UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
284-
VerifyTxOutProof, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
285-
WitnessUtxo,
266+
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfo,
267+
GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfo, GetNetworkInfoAddress,
268+
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress, GetRawMempool,
269+
GetRawMempoolVerbose, GetRawTransaction, GetRawTransactionVerbose,
270+
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail,
271+
GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo,
272+
GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfo, GetWalletInfoError,
273+
GetZmqNotifications, ListAddressGroupings, ListAddressGroupingsError, ListAddressGroupingsItem,
274+
ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError,
275+
ListReceivedByAddress, ListReceivedByAddressError, ListReceivedByAddressItem, ListSinceBlock,
276+
ListSinceBlockError, ListSinceBlockTransaction, ListSinceBlockTransactionError,
277+
ListTransactions, ListTransactionsItem, ListTransactionsItemError, ListUnspentItemError,
278+
ListWallets, LoadWallet, LockUnspent, Locked, Logging, MapMempoolEntryError, MempoolAcceptance,
279+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, PruneBlockchain, PsbtInput,
280+
PsbtOutput, PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput,
281+
RawTransactionOutput, RescanBlockchain, ScriptType, 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,
286287
};

‎types/src/v21/blockchain/into.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use alloc::collections::BTreeMap;
55
use bitcoin::{hex, BlockHash, Network, Txid, Work, Wtxid};
66

77
use super::{
8-
GetBlockchainInfo, GetBlockchainInfoError, GetMempoolEntry, GetMempoolInfo,
9-
GetMempoolInfoError, MempoolEntry, MempoolEntryError, GetMempoolAncestors,
10-
GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose, MapMempoolEntryError,
8+
GetBlockchainInfo, GetBlockchainInfoError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
9+
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
10+
GetMempoolInfoError, MapMempoolEntryError, MempoolEntry, MempoolEntryError,
1111
};
1212
use crate::model;
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use serde::{Deserialize, Serialize};
1212

1313
pub use super::{
1414
Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBlockchainInfoError, GetMempoolInfoError,
15-
MempoolEntryError, MempoolEntryFees, MapMempoolEntryError,
15+
MapMempoolEntryError, MempoolEntryError, MempoolEntryFees,
1616
};
1717

1818
/// Result of JSON-RPC method `getblockchaininfo`.

‎types/src/v21/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ mod wallet;
241241
#[doc(inline)]
242242
pub use self::{
243243
blockchain::{
244-
Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, GetMempoolInfo, MempoolEntry, Softfork,
245-
SoftforkType, GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
246-
GetMempoolDescendantsVerbose,
244+
Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
245+
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, GetMempoolInfo,
246+
MempoolEntry, Softfork, SoftforkType,
247247
},
248248
generating::GenerateBlock,
249249
network::{GetNetworkInfo, GetPeerInfo, PeerInfo},
@@ -297,8 +297,8 @@ pub use crate::{
297297
v19::{
298298
Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine,
299299
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
300-
GetChainTxStats, GetDescriptorInfo, GetRpcInfo, MapMempoolEntryError,
301-
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
300+
GetChainTxStats, GetDescriptorInfo, GetRpcInfo, MapMempoolEntryError, MempoolEntryError,
301+
MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
302302
},
303303
v20::{
304304
Banned, CreateMultisig, GenerateToDescriptor, GetAddressInfo, GetAddressInfoEmbedded,

‎types/src/v22/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,16 +302,16 @@ pub use crate::{
302302
v19::{
303303
Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances, GetBalancesError, GetBalancesMine,
304304
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
305-
GetChainTxStats, GetDescriptorInfo, GetRpcInfo, MapMempoolEntryError,
306-
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
305+
GetChainTxStats, GetDescriptorInfo, GetRpcInfo, MapMempoolEntryError, MempoolEntryError,
306+
MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
307307
},
308308
v20::{CreateMultisig, GenerateToDescriptor, GetTransaction, GetTransactionDetail},
309309
v21::{
310310
Bip9SoftforkInfo, GenerateBlock, GetBlockchainInfo, GetIndexInfo, GetIndexInfoName,
311-
GetMempoolEntry, GetNetworkInfo, ImportDescriptors, ImportDescriptorsResult, MempoolEntry, PsbtBumpFee,
312-
PsbtBumpFeeError, Send, SendError, Softfork, SoftforkType, UnloadWallet, UpgradeWallet,
313311
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
314-
GetMempoolDescendantsVerbose,
312+
GetMempoolDescendantsVerbose, GetMempoolEntry, GetNetworkInfo, ImportDescriptors,
313+
ImportDescriptorsResult, MempoolEntry, PsbtBumpFee, PsbtBumpFeeError, Send, SendError,
314+
Softfork, SoftforkType, UnloadWallet, UpgradeWallet,
315315
},
316316
ScriptPubkey,
317317
};

‎types/src/v23/blockchain/into.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ use bitcoin::{hex, BlockHash, Network, Txid, Work, Wtxid};
66

77
use super::{
88
Bip9Info, Bip9Statistics, DeploymentInfo, GetBlockchainInfo, GetBlockchainInfoError,
9-
GetDeploymentInfo, GetDeploymentInfoError, GetMempoolEntry, MempoolEntry, MempoolEntryError,
10-
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants, GetMempoolDescendantsVerbose, MapMempoolEntryError,
9+
GetDeploymentInfo, GetDeploymentInfoError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
10+
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, MapMempoolEntryError,
11+
MempoolEntry, MempoolEntryError,
1112
};
1213
use crate::model;
1314

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ use alloc::collections::BTreeMap;
1212
use serde::{Deserialize, Serialize};
1313

1414
pub use self::error::GetDeploymentInfoError;
15-
pub use super::{GetBlockchainInfoError, MapMempoolEntryError, MempoolEntryError, MempoolEntryFees, Softfork};
15+
pub use super::{
16+
GetBlockchainInfoError, MapMempoolEntryError, MempoolEntryError, MempoolEntryFees, Softfork,
17+
};
1618

1719
/// Result of JSON-RPC method `getblockchaininfo`.
1820
///

‎types/src/v23/mod.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ mod wallet;
247247
pub use self::{
248248
blockchain::{
249249
Bip9Info, Bip9Statistics, DeploymentInfo, GetBlockchainInfo, GetDeploymentInfo,
250-
GetDeploymentInfoError, GetMempoolEntry, MempoolEntry, SaveMempool,
251-
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
252-
GetMempoolDescendantsVerbose,
250+
GetDeploymentInfoError, GetMempoolAncestors, GetMempoolAncestorsVerbose,
251+
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetMempoolEntry, MempoolEntry,
252+
SaveMempool,
253253
},
254254
control::Logging,
255255
network::{GetPeerInfo, PeerInfo},
@@ -304,9 +304,8 @@ pub use crate::{
304304
Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalances,
305305
GetBalancesError, GetBalancesMine, GetBalancesWatchOnly, GetBlockFilter,
306306
GetBlockFilterError, GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo,
307-
GetRpcInfo, MapMempoolEntryError,
308-
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag, Softfork,
309-
SoftforkType,
307+
GetRpcInfo, MapMempoolEntryError, MempoolEntryError, MempoolEntryFees,
308+
MempoolEntryFeesError, SetWalletFlag, Softfork, SoftforkType,
310309
},
311310
v20::{GenerateToDescriptor, GetTransactionDetail},
312311
v21::{

0 commit comments

Comments
 (0)