Browse Source

lightningd: remove chainparams local parameter from wallet.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
travis-debug
Rusty Russell 5 years ago
committed by Christian Decker
parent
commit
edbcb6fa15
  1. 2
      lightningd/lightningd.c
  2. 3
      lightningd/test/run-find_my_abspath.c
  3. 3
      wallet/wallet.c
  4. 3
      wallet/wallet.h

2
lightningd/lightningd.c

@ -746,7 +746,7 @@ int main(int argc, char *argv[])
/*~ Our default names, eg. for the database file, are not dependent on
* the network. Instead, the db knows what chain it belongs to, and we
* simple barf here if it's wrong. */
if (!wallet_network_check(ld->wallet, chainparams))
if (!wallet_network_check(ld->wallet))
errx(1, "Wallet network check failed.");
/*~ Initialize the transaction filter with our pubkeys. */

3
lightningd/test/run-find_my_abspath.c

@ -186,8 +186,7 @@ void wallet_blocks_heights(struct wallet *w UNNEEDED, u32 def UNNEEDED, u32 *min
void wallet_clean_utxos(struct wallet *w UNNEEDED, struct bitcoind *bitcoind UNNEEDED)
{ fprintf(stderr, "wallet_clean_utxos called!\n"); abort(); }
/* Generated stub for wallet_network_check */
bool wallet_network_check(struct wallet *w UNNEEDED,
const struct chainparams *chainparams UNNEEDED)
bool wallet_network_check(struct wallet *w UNNEEDED)
{ fprintf(stderr, "wallet_network_check called!\n"); abort(); }
/* Generated stub for wallet_new */
struct wallet *wallet_new(struct lightningd *ld UNNEEDED, struct timers *timers UNNEEDED)

3
wallet/wallet.c

@ -2528,8 +2528,7 @@ void wallet_htlc_sigs_save(struct wallet *w, u64 channel_id,
}
}
bool wallet_network_check(struct wallet *w,
const struct chainparams *chainparams)
bool wallet_network_check(struct wallet *w)
{
struct bitcoin_blkid chainhash;
struct db_stmt *stmt = db_prepare_v2(

3
wallet/wallet.h

@ -1021,8 +1021,7 @@ void wallet_htlc_sigs_save(struct wallet *w, u64 channel_id,
* genesis_hash with which the DB was initialized. Returns false if
* the check failed, i.e., if the genesis hashes do not match.
*/
bool wallet_network_check(struct wallet *w,
const struct chainparams *chainparams);
bool wallet_network_check(struct wallet *w);
/**
* wallet_block_add - Add a block to the blockchain tracked by this wallet

Loading…
Cancel
Save