From 28030c3d6be8b22193958346bcc77e6bf52cdae5 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Tue, 20 Jun 2017 15:34:43 +0200 Subject: [PATCH] bitcoind: peer argument to bitcoind_sendrawtx is unused This was a bit misleading, and we were passing in NULL sometimes anyway. Removed unused argument. --- daemon/bitcoind.c | 3 +-- daemon/bitcoind.h | 7 +++---- daemon/chaintopology.c | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/daemon/bitcoind.c b/daemon/bitcoind.c index 0c3d74222..dc2a28e1f 100644 --- a/daemon/bitcoind.c +++ b/daemon/bitcoind.c @@ -286,8 +286,7 @@ static void process_sendrawtx(struct bitcoin_cli *bcli) cb(bcli->bitcoind, *bcli->exitstatus, msg, bcli->cb_arg); } -void bitcoind_sendrawtx_(struct peer *peer, - struct bitcoind *bitcoind, +void bitcoind_sendrawtx_(struct bitcoind *bitcoind, const char *hextx, void (*cb)(struct bitcoind *bitcoind, int exitstatus, const char *msg, void *), diff --git a/daemon/bitcoind.h b/daemon/bitcoind.h index 5ab05fcec..3145d6bb9 100644 --- a/daemon/bitcoind.h +++ b/daemon/bitcoind.h @@ -52,15 +52,14 @@ void bitcoind_estimate_fee_(struct bitcoind *bitcoind, u64), \ (arg)) -void bitcoind_sendrawtx_(struct peer *peer, - struct bitcoind *bitcoind, +void bitcoind_sendrawtx_(struct bitcoind *bitcoind, const char *hextx, void (*cb)(struct bitcoind *bitcoind, int exitstatus, const char *msg, void *), void *arg); -#define bitcoind_sendrawtx(peer_, bitcoind_, hextx, cb, arg) \ - bitcoind_sendrawtx_((peer_), (bitcoind_), (hextx), \ +#define bitcoind_sendrawtx(bitcoind_, hextx, cb, arg) \ + bitcoind_sendrawtx_((bitcoind_), (hextx), \ typesafe_cb_preargs(void, void *, \ (cb), (arg), \ struct bitcoind *, \ diff --git a/daemon/chaintopology.c b/daemon/chaintopology.c index 0456c1a67..e02be4567 100644 --- a/daemon/chaintopology.c +++ b/daemon/chaintopology.c @@ -193,7 +193,7 @@ static void broadcast_remainder(struct bitcoind *bitcoind, } /* Broadcast next one. */ - bitcoind_sendrawtx(NULL, bitcoind, txs->txs[txs->cursor], + bitcoind_sendrawtx(bitcoind, txs->txs[txs->cursor], broadcast_remainder, txs); } @@ -284,7 +284,7 @@ void broadcast_tx(struct chain_topology *topo, if (topo->dev_no_broadcast) broadcast_done(topo->bitcoind, 0, "dev_no_broadcast", otx); else - bitcoind_sendrawtx(peer, topo->bitcoind, otx->hextx, + bitcoind_sendrawtx(topo->bitcoind, otx->hextx, broadcast_done, otx); }