Skip to content

Commit f2a422b

Browse files
jamillambertjamillambert
committed
Fix MempoolEntry exports
MempoolEntry is redefined in v21, v23 and v24, but the v19 definition was reexported. Export the correct versions.
1 parent 96e084d commit f2a422b

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

‎types/src/v21/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ mod wallet;
241241
#[doc(inline)]
242242
pub use self::{
243243
blockchain::{
244-
Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, GetMempoolInfo, Softfork,
244+
Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, GetMempoolInfo, MempoolEntry, Softfork,
245245
SoftforkType,
246246
},
247247
generating::GenerateBlock,
@@ -298,7 +298,7 @@ pub use crate::{
298298
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
299299
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
300300
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
301-
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
301+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
302302
},
303303
v20::{
304304
Banned, CreateMultisig, GenerateToDescriptor, GetAddressInfo, GetAddressInfoEmbedded,

‎types/src/v22/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,12 @@ pub use crate::{
304304
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
305305
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
306306
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
307-
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
307+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
308308
},
309309
v20::{CreateMultisig, GenerateToDescriptor, GetTransaction, GetTransactionDetail},
310310
v21::{
311311
Bip9SoftforkInfo, GenerateBlock, GetBlockchainInfo, GetIndexInfo, GetIndexInfoName,
312-
GetMempoolEntry, GetNetworkInfo, ImportDescriptors, ImportDescriptorsResult, PsbtBumpFee,
312+
GetMempoolEntry, GetNetworkInfo, ImportDescriptors, ImportDescriptorsResult, MempoolEntry, PsbtBumpFee,
313313
PsbtBumpFeeError, Send, SendError, Softfork, SoftforkType, UnloadWallet, UpgradeWallet,
314314
},
315315
ScriptPubkey,

‎types/src/v23/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ mod wallet;
247247
pub use self::{
248248
blockchain::{
249249
Bip9Info, Bip9Statistics, DeploymentInfo, GetBlockchainInfo, GetDeploymentInfo,
250-
GetDeploymentInfoError, GetMempoolEntry, SaveMempool,
250+
GetDeploymentInfoError, GetMempoolEntry, MempoolEntry, SaveMempool,
251251
},
252252
control::Logging,
253253
network::{GetPeerInfo, PeerInfo},
@@ -303,7 +303,7 @@ pub use crate::{
303303
GetBalancesError, GetBalancesMine, GetBalancesWatchOnly, GetBlockFilter,
304304
GetBlockFilterError, GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo,
305305
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
306-
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError, MempoolEntry,
306+
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
307307
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag, Softfork,
308308
SoftforkType,
309309
},

‎types/src/v24/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ mod wallet;
249249
pub use self::{
250250
blockchain::{
251251
GetMempoolEntry, GetMempoolInfo, GetTxSpendingPrevout, GetTxSpendingPrevoutError,
252-
GetTxSpendingPrevoutItem,
252+
GetTxSpendingPrevoutItem, MempoolEntry,
253253
},
254254
network::{GetPeerInfo, PeerInfo},
255255
raw_transactions::{
@@ -306,7 +306,7 @@ pub use crate::{
306306
GetBalancesError, GetBalancesMine, GetBalancesWatchOnly, GetBlockFilter,
307307
GetBlockFilterError, GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo,
308308
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
309-
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError, MempoolEntry,
309+
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
310310
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag, Softfork,
311311
SoftforkType,
312312
},

‎types/src/v25/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ pub use crate::{
299299
GetBalancesError, GetBalancesMine, GetBalancesWatchOnly, GetBlockFilter,
300300
GetBlockFilterError, GetBlockchainInfoError, GetChainTxStats, GetDescriptorInfo,
301301
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
302-
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError, MempoolEntry,
302+
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
303303
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag, Softfork,
304304
SoftforkType,
305305
},
@@ -319,7 +319,7 @@ pub use crate::{
319319
v24::{
320320
DecodePsbt, DecodePsbtError, GetMempoolEntry, GetMempoolInfo, GetPeerInfo, GetTransaction,
321321
GetTransactionDetail, GetTransactionError, GetTxSpendingPrevout, GetTxSpendingPrevoutError,
322-
GlobalXpub, ListUnspent, ListUnspentItem, MigrateWallet, PeerInfo, Proprietary, PsbtInput,
322+
GlobalXpub, ListUnspent, ListUnspentItem, MempoolEntry, MigrateWallet, PeerInfo, Proprietary, PsbtInput,
323323
PsbtOutput, SendAll, SendAllError, SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf,
324324
TaprootScript, TaprootScriptPathSig,
325325
},

‎types/src/v26/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ pub use crate::{
319319
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
320320
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
321321
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
322-
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
322+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
323323
Softfork, SoftforkType,
324324
},
325325
v20::GenerateToDescriptor,
@@ -338,7 +338,7 @@ pub use crate::{
338338
v24::{
339339
DecodePsbt, DecodePsbtError, GetMempoolEntry, GetMempoolInfo, GetTransactionDetail,
340340
GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem,
341-
MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
341+
MempoolEntry, MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
342342
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
343343
TaprootScriptPathSig,
344344
},

‎types/src/v27/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub use crate::{
300300
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
301301
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
302302
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
303-
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
303+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
304304
Softfork, SoftforkType,
305305
},
306306
v20::GenerateToDescriptor,
@@ -319,7 +319,7 @@ pub use crate::{
319319
v24::{
320320
DecodePsbt, DecodePsbtError, GetMempoolEntry, GetMempoolInfo, GetTransactionDetail,
321321
GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem,
322-
MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
322+
MempoolEntry, MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
323323
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
324324
TaprootScriptPathSig,
325325
},

‎types/src/v28/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ pub use crate::{
316316
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetBlockchainInfoError,
317317
GetChainTxStats, GetDescriptorInfo, GetMempoolAncestors, GetMempoolAncestorsVerbose,
318318
GetMempoolDescendants, GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
319-
MempoolEntry, MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
319+
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag,
320320
Softfork, SoftforkType,
321321
},
322322
v20::GenerateToDescriptor,
@@ -332,7 +332,7 @@ pub use crate::{
332332
v24::{
333333
DecodePsbt, DecodePsbtError, GetMempoolEntry, GetMempoolInfo, GetTransactionDetail,
334334
GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem,
335-
MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
335+
MempoolEntry, MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
336336
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
337337
TaprootScriptPathSig,
338338
},

‎types/src/v29/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ pub use crate::{
309309
Bip9SoftforkInfo, Bip9SoftforkStatistics, Bip9SoftforkStatus, GetBalancesMine,
310310
GetBalancesWatchOnly, GetBlockFilter, GetBlockFilterError, GetChainTxStats,
311311
GetMempoolAncestors, GetMempoolAncestorsVerbose, GetMempoolDescendants,
312-
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError, MempoolEntry,
312+
GetMempoolDescendantsVerbose, GetRpcInfo, MapMempoolEntryError,
313313
MempoolEntryError, MempoolEntryFees, MempoolEntryFeesError, SetWalletFlag, Softfork,
314314
SoftforkType,
315315
},
@@ -326,7 +326,7 @@ pub use crate::{
326326
v24::{
327327
DecodePsbt, DecodePsbtError, GetMempoolEntry, GetMempoolInfo, GetTransactionDetail,
328328
GetTxSpendingPrevout, GetTxSpendingPrevoutError, GlobalXpub, ListUnspent, ListUnspentItem,
329-
MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
329+
MempoolEntry, MigrateWallet, Proprietary, PsbtInput, PsbtOutput, SendAll, SendAllError,
330330
SimulateRawTransaction, TaprootBip32Deriv, TaprootLeaf, TaprootScript,
331331
TaprootScriptPathSig,
332332
},

0 commit comments

Comments
 (0)