Merge pull request #263 from rustaceanrob/extern-tokio-1-13

Export `tokio` and remove module exports for `mpsc` in client
rustaceanrob · Jan 14, 2025 · f906dc8 · f906dc8
2 parents 601f5b3 + aa151a7
commit f906dc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/core/client.rs b/src/core/client.rs
@@ -6,9 +6,7 @@ use bitcoin::Transaction;
 use bitcoin::{block::Header, FeeRate};
 use std::{collections::BTreeMap, ops::Range, time::Duration};
 use tokio::sync::mpsc;
-pub use tokio::sync::mpsc::Receiver;
 use tokio::sync::mpsc::Sender;
-pub use tokio::sync::mpsc::UnboundedReceiver;
 
 use crate::{Event, Log, TrustedPeer, TxBroadcast};
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -138,6 +138,8 @@ pub use bitcoin::{
     Address, Block, BlockHash, FeeRate, Network, ScriptBuf, Transaction, Txid,
 };
 
+pub extern crate tokio;
+
 /// A Bitcoin [`Transaction`] with additional context.
 #[derive(Debug, Clone)]
 #[allow(dead_code)]

diff --git a/tests/core.rs b/tests/core.rs
@@ -11,12 +11,10 @@ use corepc_node::serde_json;
 use corepc_node::{anyhow, exe_path};
 use kyoto::{
     chain::checkpoints::HeaderCheckpoint,
-    core::{
-        client::{Client, Receiver},
-        node::Node,
-    },
+    core::{client::Client, node::Node},
     BlockHash, Event, Log, NodeState, ServiceFlags, SqliteHeaderDb, SqlitePeerDb, TrustedPeer,
 };
+use tokio::sync::mpsc::Receiver;
 use tokio::sync::mpsc::UnboundedReceiver;
 
 // Start the bitcoin daemon either through an environment variable or by download