X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fbatteries%2FChannelManagerConstructor.java;h=61bec8e3cdb0e37f82ffd2b4099254799ae8ea76;hb=502589786542336214b743a101b29e9f69e598c9;hp=43bea0559b5bfeb045c66361b0916f08e35f390c;hpb=d671343911c12bd088c3130c1be53d18a345808d;p=ldk-java diff --git a/src/main/java/org/ldk/batteries/ChannelManagerConstructor.java b/src/main/java/org/ldk/batteries/ChannelManagerConstructor.java index 43bea055..61bec8e3 100644 --- a/src/main/java/org/ldk/batteries/ChannelManagerConstructor.java +++ b/src/main/java/org/ldk/batteries/ChannelManagerConstructor.java @@ -81,7 +81,8 @@ public class ChannelManagerConstructor { channel_monitors = new TwoTuple[0]; channel_manager_latest_block_hash = null; this.chain_monitor = chain_monitor; - channel_manager = ChannelManager.constructor_new(fee_estimator, chain_monitor.as_Watch(), tx_broadcaster, logger, keys_interface, config, network, current_blockchain_tip_hash, current_blockchain_tip_height); + BestBlock block = BestBlock.constructor_new(current_blockchain_tip_hash, current_blockchain_tip_height); + channel_manager = ChannelManager.constructor_new(fee_estimator, chain_monitor.as_Watch(), tx_broadcaster, logger, keys_interface, config, network, block); } /** @@ -118,6 +119,7 @@ public class ChannelManagerConstructor { need_persist = true; } events = this.chain_monitor.as_EventsProvider().get_and_clear_pending_events(); + if (events.length != 0) { persister.handle_events(events); need_persist = true; @@ -129,7 +131,7 @@ public class ChannelManagerConstructor { return; } if (lastTimerTick < System.currentTimeMillis() - 60 * 1000) { - this.channel_manager.timer_chan_freshness_every_min(); + this.channel_manager.timer_tick_occurred(); lastTimerTick = System.currentTimeMillis(); } }