Merge pull request #99 from alexanderwiederin/fix-import

Chore(lib): Fix imports for TxIn and BlockValidationStateRef

Author: sedited

examples/src/silentpaymentscanner.rs

@@ -7,13 +7,10 @@ use bitcoin::consensus::deserialize;
 use bitcoin::hashes::Hash;
 use bitcoin::Transaction;
 use bitcoin::{PrivateKey, XOnlyPublicKey};
-use bitcoinkernel::Block;
-use bitcoinkernel::BlockSpentOutputs;
-use bitcoinkernel::BlockTreeEntry;
-use bitcoinkernel::TransactionSpentOutputsRef;
 use bitcoinkernel::{
-    prelude::*, ChainType, ChainstateManager, ChainstateManagerBuilder, Context, ContextBuilder,
-    KernelError, Log, Logger,
+    prelude::*, Block, BlockSpentOutputs, BlockTreeEntry, ChainType, ChainstateManager,
+    ChainstateManagerBuilder, Context, ContextBuilder, KernelError, Log, Logger,
+    TransactionSpentOutputsRef,
 };
 use env_logger::Builder;
 use log::LevelFilter;

src/core/mod.rs

@@ -10,11 +10,11 @@ pub use block::{
 };
 pub use block_tree_entry::BlockTreeEntry;
 pub use script::{ScriptPubkey, ScriptPubkeyRef};
-pub use transaction::{Transaction, TransactionRef, TxOut, TxOutRef};
+pub use transaction::{Transaction, TransactionRef, TxIn, TxOut, TxOutRef};
 
 pub use block::{BlockHashExt, BlockSpentOutputsExt, CoinExt, TransactionSpentOutputsExt};
 pub use script::ScriptPubkeyExt;
-pub use transaction::{TransactionExt, TxOutExt};
+pub use transaction::{TransactionExt, TxInExt, TxOutExt};
 
 pub use verify::{verify, ScriptVerifyError, ScriptVerifyStatus};
 

src/lib.rs

@@ -113,7 +113,7 @@ impl std::error::Error for KernelError {
 pub use crate::core::{
     verify, Block, BlockHash, BlockSpentOutputs, BlockSpentOutputsRef, BlockTreeEntry, Coin,
     CoinRef, ScriptPubkey, ScriptPubkeyRef, ScriptVerifyError, ScriptVerifyStatus, Transaction,
-    TransactionRef, TransactionSpentOutputs, TransactionSpentOutputsRef, TxOut, TxOutRef,
+    TransactionRef, TransactionSpentOutputs, TransactionSpentOutputsRef, TxIn, TxOut, TxOutRef,
 };
 
 pub use crate::log::{disable_logging, Log, LogCategory, LogLevel, Logger};
@@ -138,7 +138,7 @@ pub use crate::core::verify_flags::{
 pub mod prelude {
     pub use crate::core::{
         BlockHashExt, BlockSpentOutputsExt, CoinExt, ScriptPubkeyExt, TransactionExt,
-        TransactionSpentOutputsExt, TxOutExt,
+        TransactionSpentOutputsExt, TxInExt, TxOutExt,
     };
     pub use crate::notifications::BlockValidationStateExt;
 }

tests/test.rs

@@ -1,14 +1,12 @@
 #[cfg(test)]
 mod tests {
     use bitcoin::consensus::deserialize;
-    use bitcoinkernel::core::transaction::TxIn;
-    use bitcoinkernel::notifications::types::BlockValidationStateRef;
     use bitcoinkernel::{
-        prelude::*, verify, Block, BlockHash, BlockSpentOutputs, BlockTreeEntry, ChainParams,
-        ChainType, ChainstateManager, ChainstateManagerBuilder, Coin, Context, ContextBuilder,
-        KernelError, Log, Logger, ScriptPubkey, ScriptVerifyError, Transaction,
-        TransactionSpentOutputs, TxOut, TxOutRef, VERIFY_ALL_PRE_TAPROOT, VERIFY_TAPROOT,
-        VERIFY_WITNESS,
+        prelude::*, verify, Block, BlockHash, BlockSpentOutputs, BlockTreeEntry,
+        BlockValidationStateRef, ChainParams, ChainType, ChainstateManager,
+        ChainstateManagerBuilder, Coin, Context, ContextBuilder, KernelError, Log, Logger,
+        ScriptPubkey, ScriptVerifyError, Transaction, TransactionSpentOutputs, TxIn, TxOut,
+        TxOutRef, VERIFY_ALL_PRE_TAPROOT, VERIFY_TAPROOT, VERIFY_WITNESS,
     };
     use std::fs::File;
     use std::io::{BufRead, BufReader};