|
@@ -358,7 +358,6 @@ impl BtcClient {
|
|
|
|
|
|
|
|
async fn handle_subscribe_request(
|
|
async fn handle_subscribe_request(
|
|
|
self: Arc<Self>,
|
|
self: Arc<Self>,
|
|
|
- //tx: impl Watchable + Send + 'static,
|
|
|
|
|
btc_keys: Account,
|
|
btc_keys: Account,
|
|
|
drk_pub_key: jubjub::SubgroupPoint,
|
|
drk_pub_key: jubjub::SubgroupPoint,
|
|
|
) -> BtcResult<()> {
|
|
) -> BtcResult<()> {
|
|
@@ -771,21 +770,6 @@ impl fmt::Display for ScriptStatus {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-pub trait Watchable {
|
|
|
|
|
- fn id(&self) -> Txid;
|
|
|
|
|
- fn script(&self) -> Script;
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-impl Watchable for (Txid, Script) {
|
|
|
|
|
- fn id(&self) -> Txid {
|
|
|
|
|
- self.0
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- fn script(&self) -> Script {
|
|
|
|
|
- self.1.clone()
|
|
|
|
|
- }
|
|
|
|
|
-}
|
|
|
|
|
impl Encodable for bitcoin::Transaction {
|
|
impl Encodable for bitcoin::Transaction {
|
|
|
fn encode<S: std::io::Write>(&self, s: S) -> Result<usize> {
|
|
fn encode<S: std::io::Write>(&self, s: S) -> Result<usize> {
|
|
|
let tx = self.serialize();
|
|
let tx = self.serialize();
|