Skip to content

Commit 96686f3

Browse files
jamillambertjamillambert
committed
Tidy up decodepsbt error exports and imports
Reexport the errors from v17 for later versions instead of importing from `crate::v17`. Reexport the new version of the errors from v24 in later versions. Reorginazation only, no functional changes.
1 parent e9d7827 commit 96686f3

File tree

17 files changed

+237
-211
lines changed

17 files changed

+237
-211
lines changed

‎types/src/v18/mod.rs‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -256,36 +256,37 @@ pub use self::{
256256
#[doc(inline)]
257257
pub use crate::v17::{
258258
AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress,
259-
AddressInformation, Banned, Bip32Deriv, Bip9Softfork, Bip9SoftforkStatus, BumpFee,
260-
BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction,
261-
ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction,
262-
CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript,
263-
DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt,
264-
FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress,
265-
GetAddedNodeInfo, GetAddressInfoEmbeddedError, GetAddressInfoLabel, GetAddressesByLabel,
266-
GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderError,
267-
GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError,
268-
GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError,
269-
GetBlockVerboseZero, GetBlockchainInfo, GetBlockchainInfoError, GetChainTips, GetChainTxStats,
270-
GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfo,
271-
GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfo, GetNetworkInfoAddress,
272-
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress,
273-
GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
274-
GetReceivedByAddress, GetTransaction, GetTransactionDetail, GetTransactionDetailError,
275-
GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError,
276-
GetUnconfirmedBalance, GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError,
277-
ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem,
278-
ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError,
279-
ListTransactions, ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, Logging,
280-
MapMempoolEntryError, MempoolAcceptance, MempoolEntryError, MempoolEntryFees,
281-
MempoolEntryFeesError, NumericError, PruneBlockchain, PsbtInput, PsbtOutput, PsbtScript,
282-
RawTransaction, RawTransactionError, RawTransactionInput, RawTransactionOutput,
283-
RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive,
284-
SetTxFee, SignFail, SignFailError, SignMessage, SignMessageWithPrivKey, SignRawTransaction,
285-
SignRawTransactionError, SignRawTransactionWithKey, SignRawTransactionWithWallet, Softfork,
286-
SoftforkReject, TestMempoolAccept, TransactionCategory, TransactionItem, TransactionItemError,
287-
UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain, VerifyMessage,
288-
VerifyTxOutProof, WaitForBlock, WaitForBlockError, WaitForBlockHeight, WaitForBlockHeightError,
289-
WaitForNewBlock, WaitForNewBlockError, WalletCreateFundedPsbt, WalletCreateFundedPsbtError,
290-
WalletProcessPsbt, WitnessUtxo,
259+
AddressInformation, Banned, Bip32Deriv, Bip32DerivError, Bip9Softfork, Bip9SoftforkStatus,
260+
BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt,
261+
CombineRawTransaction, ConvertToPsbt, CreateMultisig, CreateMultisigError, CreatePsbt,
262+
CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction,
263+
DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee,
264+
FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate,
265+
GenerateToAddress, GetAddedNodeInfo, GetAddressInfoEmbeddedError, GetAddressInfoLabel,
266+
GetAddressesByLabel, GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader,
267+
GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats,
268+
GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne,
269+
GetBlockVerboseOneError, GetBlockVerboseZero, GetBlockchainInfo, GetBlockchainInfoError,
270+
GetChainTips, GetChainTxStats, GetChainTxStatsError, GetConnectionCount, GetDifficulty,
271+
GetMemoryInfoStats, GetMempoolInfo, GetMempoolInfoError, GetMiningInfo, GetNetTotals,
272+
GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork,
273+
GetNewAddress, GetRawChangeAddress, GetRawTransaction, GetRawTransactionVerbose,
274+
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransaction, GetTransactionDetail,
275+
GetTransactionDetailError, GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo,
276+
GetTxOutSetInfoError, GetUnconfirmedBalance, GetWalletInfoError, ListAddressGroupings,
277+
ListAddressGroupingsError, ListAddressGroupingsItem, ListBanned, ListLabels, ListLockUnspent,
278+
ListLockUnspentItem, ListLockUnspentItemError, ListReceivedByAddressError, ListSinceBlock,
279+
ListSinceBlockError, ListTransactions, ListUnspentItemError, ListWallets, LoadWallet,
280+
LockUnspent, Locked, Logging, MapMempoolEntryError, MempoolAcceptance, MempoolEntryError,
281+
MempoolEntryFees, MempoolEntryFeesError, NumericError, PartialSignatureError, PruneBlockchain,
282+
PsbtInput, PsbtOutput, PsbtScript, RawTransaction, RawTransactionError, RawTransactionInput,
283+
RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction,
284+
SendToAddress, SetNetworkActive, SetTxFee, SignFail, SignFailError, SignMessage,
285+
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError, SignRawTransactionWithKey,
286+
SignRawTransactionWithWallet, Softfork, SoftforkReject, TestMempoolAccept, TransactionCategory,
287+
TransactionItem, TransactionItemError, UploadTarget, ValidateAddress, ValidateAddressError,
288+
VerifyChain, VerifyMessage, VerifyTxOutProof, WaitForBlock, WaitForBlockError,
289+
WaitForBlockHeight, WaitForBlockHeightError, WaitForNewBlock, WaitForNewBlockError,
290+
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
291+
WitnessUtxoError,
291292
};

‎types/src/v19/mod.rs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ pub use self::{
252252
#[doc(inline)]
253253
pub use crate::v17::{
254254
AbortRescan, AddMultisigAddress, AddMultisigAddressError, AddedNode, AddedNodeAddress,
255-
AddressInformation, Banned, Bip125Replaceable, BumpFee, BumpFeeError, ChainTips,
256-
ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt,
255+
AddressInformation, Banned, Bip125Replaceable, Bip32DerivError, BumpFee, BumpFeeError,
256+
ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt,
257257
CreateMultisig, CreateMultisigError, CreatePsbt, CreateRawTransaction, CreateWallet,
258258
DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError,
259259
DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError,
@@ -272,15 +272,16 @@ pub use crate::v17::{
272272
ListBanned, ListLabels, ListLockUnspent, ListLockUnspentItem, ListLockUnspentItemError,
273273
ListReceivedByAddressError, ListSinceBlock, ListSinceBlockError, ListTransactions,
274274
ListUnspentItemError, ListWallets, LoadWallet, LockUnspent, Locked, Logging, NumericError,
275-
PruneBlockchain, RawTransactionError, RawTransactionInput, RawTransactionOutput,
276-
RescanBlockchain, ScriptType, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive,
277-
SetTxFee, SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
278-
SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TestMempoolAccept,
279-
TransactionCategory, TransactionItem, TransactionItemError, UploadTarget, ValidateAddress,
280-
ValidateAddressError, VerifyChain, VerifyMessage, VerifyTxOutProof, WaitForBlock,
281-
WaitForBlockError, WaitForBlockHeight, WaitForBlockHeightError, WaitForNewBlock,
282-
WaitForNewBlockError, WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt,
283-
WitnessUtxo,
275+
PartialSignatureError, PruneBlockchain, RawTransactionError, RawTransactionInput,
276+
RawTransactionOutput, RescanBlockchain, ScriptType, SendMany, SendRawTransaction,
277+
SendToAddress, SetNetworkActive, SetTxFee, SignMessage, SignMessageWithPrivKey,
278+
SignRawTransaction, SignRawTransactionError, SignRawTransactionWithKey,
279+
SignRawTransactionWithWallet, SoftforkReject, TestMempoolAccept, TransactionCategory,
280+
TransactionItem, TransactionItemError, UploadTarget, ValidateAddress, ValidateAddressError,
281+
VerifyChain, VerifyMessage, VerifyTxOutProof, WaitForBlock, WaitForBlockError,
282+
WaitForBlockHeight, WaitForBlockHeightError, WaitForNewBlock, WaitForNewBlockError,
283+
WalletCreateFundedPsbt, WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
284+
WitnessUtxoError,
284285
};
285286
#[doc(inline)]
286287
pub use crate::v18::{

‎types/src/v20/mod.rs‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -248,33 +248,34 @@ pub use self::{
248248
pub use crate::{
249249
v17::{
250250
AbortRescan, AddMultisigAddressError, AddedNode, AddedNodeAddress, AddressInformation,
251-
Bip125Replaceable, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus,
252-
CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, CreatePsbt,
253-
CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction,
254-
DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee,
255-
FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate,
256-
GenerateToAddress, GetAddedNodeInfo, GetAddressInfoEmbeddedError, GetAddressesByLabel,
257-
GetBalance, GetBestBlockHash, GetBlockCount, GetBlockHash, GetBlockHeader,
258-
GetBlockHeaderError, GetBlockHeaderVerbose, GetBlockHeaderVerboseError, GetBlockStats,
259-
GetBlockStatsError, GetBlockTemplate, GetBlockTemplateError, GetBlockVerboseOne,
260-
GetBlockVerboseOneError, GetBlockVerboseZero, GetChainTips, GetChainTxStatsError,
261-
GetConnectionCount, GetDifficulty, GetMemoryInfoStats, GetMempoolInfoError, GetMiningInfo,
262-
GetNetTotals, GetNetworkInfoAddress, GetNetworkInfoError, GetNetworkInfoNetwork,
263-
GetNewAddress, GetRawChangeAddress, GetRawTransaction, GetRawTransactionVerbose,
264-
GetRawTransactionVerboseError, GetReceivedByAddress, GetTransactionDetailError,
265-
GetTransactionError, GetTxOut, GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError,
266-
GetUnconfirmedBalance, GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError,
251+
Bip125Replaceable, Bip32DerivError, BumpFee, BumpFeeError, ChainTips, ChainTipsError,
252+
ChainTipsStatus, CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError,
253+
CreatePsbt, CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError,
254+
DecodeRawTransaction, DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet,
255+
EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError, FundRawTransaction,
256+
FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo,
257+
GetAddressInfoEmbeddedError, GetAddressesByLabel, GetBalance, GetBestBlockHash,
258+
GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderError, GetBlockHeaderVerbose,
259+
GetBlockHeaderVerboseError, GetBlockStats, GetBlockStatsError, GetBlockTemplate,
260+
GetBlockTemplateError, GetBlockVerboseOne, GetBlockVerboseOneError, GetBlockVerboseZero,
261+
GetChainTips, GetChainTxStatsError, GetConnectionCount, GetDifficulty, GetMemoryInfoStats,
262+
GetMempoolInfoError, GetMiningInfo, GetNetTotals, GetNetworkInfoAddress,
263+
GetNetworkInfoError, GetNetworkInfoNetwork, GetNewAddress, GetRawChangeAddress,
264+
GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError,
265+
GetReceivedByAddress, GetTransactionDetailError, GetTransactionError, GetTxOut,
266+
GetTxOutError, GetTxOutSetInfo, GetTxOutSetInfoError, GetUnconfirmedBalance,
267+
GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError,
267268
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
268269
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
269-
LoadWallet, LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
270-
RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType, SendMany,
271-
SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
272-
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
270+
LoadWallet, LockUnspent, Locked, NumericError, PartialSignatureError, PruneBlockchain,
271+
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain,
272+
ScriptType, SendMany, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee,
273+
SignMessage, SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
273274
SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject, TestMempoolAccept,
274275
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
275276
VerifyMessage, VerifyTxOutProof, WaitForBlock, WaitForBlockError, WaitForBlockHeight,
276277
WaitForBlockHeightError, WaitForNewBlock, WaitForNewBlockError, WalletCreateFundedPsbt,
277-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
278+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, WitnessUtxoError,
278279
},
279280
v18::{
280281
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v21/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ pub use self::{
264264
pub use crate::{
265265
v17::{
266266
AbortRescan, AddMultisigAddressError, AddedNode, AddedNodeAddress, AddressInformation,
267-
BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt,
268-
CombineRawTransaction, ConvertToPsbt, CreateMultisigError, CreatePsbt,
267+
Bip32DerivError, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus,
268+
CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, CreatePsbt,
269269
CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction,
270270
DecodeScript, DecodeScriptError, DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee,
271271
FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError, Generate,
@@ -282,15 +282,15 @@ pub use crate::{
282282
GetUnconfirmedBalance, GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError,
283283
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
284284
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
285-
LoadWallet, LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
286-
RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType,
287-
SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
285+
LoadWallet, LockUnspent, Locked, NumericError, PartialSignatureError, PruneBlockchain,
286+
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain,
287+
ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
288288
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
289289
SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject,
290290
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
291291
VerifyMessage, VerifyTxOutProof, WaitForBlock, WaitForBlockError, WaitForBlockHeight,
292292
WaitForBlockHeightError, WaitForNewBlock, WaitForNewBlockError, WalletCreateFundedPsbt,
293-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
293+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, WitnessUtxoError,
294294
},
295295
v18::{
296296
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

‎types/src/v22/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ pub use self::{
266266
pub use crate::{
267267
v17::{
268268
AbortRescan, AddMultisigAddressError, AddedNode, AddedNodeAddress, AddressInformation,
269-
BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus, CombinePsbt,
270-
CombineRawTransaction, ConvertToPsbt, CreateMultisigError, CreatePsbt,
269+
Bip32DerivError, BumpFee, BumpFeeError, ChainTips, ChainTipsError, ChainTipsStatus,
270+
CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreateMultisigError, CreatePsbt,
271271
CreateRawTransaction, CreateWallet, DecodePsbt, DecodePsbtError, DecodeRawTransaction,
272272
DumpPrivKey, DumpWallet, EncryptWallet, EstimateSmartFee, FinalizePsbt, FinalizePsbtError,
273273
FundRawTransaction, FundRawTransactionError, Generate, GenerateToAddress, GetAddedNodeInfo,
@@ -284,15 +284,15 @@ pub use crate::{
284284
GetWalletInfoError, ListAddressGroupings, ListAddressGroupingsError,
285285
ListAddressGroupingsItem, ListLabels, ListLockUnspent, ListLockUnspentItem,
286286
ListLockUnspentItemError, ListReceivedByAddressError, ListUnspentItemError, ListWallets,
287-
LoadWallet, LockUnspent, Locked, NumericError, PruneBlockchain, RawTransactionError,
288-
RawTransactionInput, RawTransactionOutput, RescanBlockchain, ScriptType,
289-
SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
287+
LoadWallet, LockUnspent, Locked, NumericError, PartialSignatureError, PruneBlockchain,
288+
RawTransactionError, RawTransactionInput, RawTransactionOutput, RescanBlockchain,
289+
ScriptType, SendRawTransaction, SendToAddress, SetNetworkActive, SetTxFee, SignMessage,
290290
SignMessageWithPrivKey, SignRawTransaction, SignRawTransactionError,
291291
SignRawTransactionWithKey, SignRawTransactionWithWallet, SoftforkReject,
292292
TransactionCategory, UploadTarget, ValidateAddress, ValidateAddressError, VerifyChain,
293293
VerifyMessage, VerifyTxOutProof, WaitForBlock, WaitForBlockError, WaitForBlockHeight,
294294
WaitForBlockHeightError, WaitForNewBlock, WaitForNewBlockError, WalletCreateFundedPsbt,
295-
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo,
295+
WalletCreateFundedPsbtError, WalletProcessPsbt, WitnessUtxo, WitnessUtxoError,
296296
},
297297
v18::{
298298
ActiveCommand, AnalyzePsbt, AnalyzePsbtError, AnalyzePsbtInput, AnalyzePsbtInputMissing,

0 commit comments

Comments
 (0)