X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fldk%2FPeerTest.java;h=3373c0376221b947c98f8933061ea76e32c845fe;hb=d671343911c12bd088c3130c1be53d18a345808d;hp=746307862d04cda0a7cec84fa2ecbe49fbb46edb;hpb=aa0e2aade37133339f4113a0cd7465b111f0a0d0;p=ldk-java diff --git a/src/test/java/org/ldk/PeerTest.java b/src/test/java/org/ldk/PeerTest.java index 74630786..3373c037 100644 --- a/src/test/java/org/ldk/PeerTest.java +++ b/src/test/java/org/ldk/PeerTest.java @@ -5,7 +5,9 @@ import org.bitcoinj.script.Script; import org.junit.jupiter.api.Test; import org.ldk.impl.bindings; import org.ldk.enums.*; +import org.ldk.structs.Result_NoneChannelMonitorUpdateErrZ; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.concurrent.ConcurrentLinkedQueue; @@ -32,6 +34,7 @@ public class PeerTest { bindings.LDKBroadcasterInterface broad_trait; bindings.LDKLogger log_trait; bindings.LDKWatch watcher; + ArrayList results_to_free; Peer(byte seed) { this.log_trait = (String arg)-> System.out.println(seed + ": " + arg); @@ -41,6 +44,7 @@ public class PeerTest { this.broad_trait = tx -> { // We should broadcast }; + this.results_to_free = new ArrayList<>(); this.tx_broadcaster = bindings.LDKBroadcasterInterface_new(this.broad_trait); this.monitors = new HashMap<>(); this.watcher = new bindings.LDKWatch() { @@ -50,7 +54,9 @@ public class PeerTest { assert monitors.put(Arrays.toString(bindings.OutPoint_get_txid(funding_txo)), monitor) == null; } bindings.OutPoint_free(funding_txo); - return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + results_to_free.add(res); + return res; } @Override @@ -58,13 +64,15 @@ public class PeerTest { synchronized (monitors) { String txid = Arrays.toString(bindings.OutPoint_get_txid(funding_txo)); assert monitors.containsKey(txid); - long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, logger); + long update_res = bindings.ChannelMonitor_update_monitor(monitors.get(txid), update, tx_broadcaster, fee_estimator, logger); assert bindings.LDKCResult_NoneMonitorUpdateErrorZ_result_ok(update_res); bindings.CResult_NoneMonitorUpdateErrorZ_free(update_res); } bindings.OutPoint_free(funding_txo); bindings.ChannelMonitorUpdate_free(update); - return bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + long res = bindings.CResult_NoneChannelMonitorUpdateErrZ_ok(); + results_to_free.add(res); + return res; } @Override @@ -82,15 +90,16 @@ public class PeerTest { byte[] key_seed = new byte[32]; for (byte i = 0; i < 32; i++) { key_seed[i] = (byte) (i ^ seed); } - this.keys = bindings.KeysManager_new(key_seed, LDKNetwork.LDKNetwork_Bitcoin, System.currentTimeMillis() / 1000, (int)(System.currentTimeMillis() * 1000) & 0xffffffff); + this.keys = bindings.KeysManager_new(key_seed, System.currentTimeMillis() / 1000, (int)(System.currentTimeMillis() * 1000) & 0xffffffff); this.keys_interface = bindings.KeysManager_as_KeysInterface(keys); this.config = bindings.UserConfig_default(); - this.chan_manager = bindings.ChannelManager_new(LDKNetwork.LDKNetwork_Bitcoin, fee_estimator, chain_monitor, tx_broadcaster, logger, keys_interface, config, 1); + long params = bindings.ChainParameters_new(LDKNetwork.LDKNetwork_Bitcoin, new byte[32], 0); + this.chan_manager = bindings.ChannelManager_new(fee_estimator, chain_monitor, tx_broadcaster, logger, keys_interface, config, params); this.node_id = bindings.ChannelManager_get_our_node_id(chan_manager); this.chan_manager_events = bindings.ChannelManager_as_EventsProvider(chan_manager); this.chan_handler = bindings.ChannelManager_as_ChannelMessageHandler(chan_manager); - this.router = bindings.NetGraphMsgHandler_new(0, logger); + this.router = bindings.NetGraphMsgHandler_new(new byte[32], 0, logger); this.route_handler = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(router); this.message_handler = bindings.MessageHandler_new(chan_handler, route_handler); @@ -100,27 +109,20 @@ public class PeerTest { } void connect_block(Block b, Transaction t, int height) { - byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80); - long[] txn; - long txdata = 0; - if (t != null) { - txdata = bindings.new_txpointer_copy_data(t.bitcoinSerialize()); - txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, txdata)}; - } else - txn = new long[0]; - bindings.ChannelManager_block_connected(chan_manager, header, txn, height); - if (txdata != 0) bindings.txpointer_free(txdata); + long listen = bindings.ChannelManager_as_Listen(chan_manager); + bindings.Listen_block_connected(listen, b.bitcoinSerialize(), height); + bindings.Listen_free(listen); synchronized (monitors) { for (Long mon : monitors.values()) { - if (t != null) { - txdata = bindings.new_txpointer_copy_data(t.bitcoinSerialize()); - txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, txdata)}; - } else + long[] txn; + if (t != null) + txn = new long[]{bindings.C2Tuple_usizeTransactionZ_new(1, t.bitcoinSerialize())}; + else txn = new long[0]; + byte[] header = Arrays.copyOfRange(b.bitcoinSerialize(), 0, 80); long[] ret = bindings.ChannelMonitor_block_connected(mon, header, txn, height, tx_broadcaster, fee_estimator, logger); - if (txdata != 0) bindings.txpointer_free(txdata); for (long r : ret) { - bindings.C2Tuple_TxidCVec_TxOutZZ_free(r); + bindings.C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(r); } } } @@ -147,6 +149,9 @@ public class PeerTest { bindings.ChannelMonitor_free(mon); } } + for (Long res : results_to_free) { + bindings.CResult_NoneChannelMonitorUpdateErrZ_free(res); + } } } @@ -179,7 +184,7 @@ public class PeerTest { } @Override public void disconnect_socket() { assert false; } - @Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 2; } + @Override public boolean eq(long other_arg) { boolean ret = bindings.SocketDescriptor_hash(other_arg) == 2; bindings.SocketDescriptor_free(other_arg); return ret; } @Override public long hash() { return 2; } }; long descriptor2 = bindings.LDKSocketDescriptor_new(sock1); @@ -192,7 +197,7 @@ public class PeerTest { } @Override public void disconnect_socket() { assert false; } - @Override public boolean eq(long other_arg) { return bindings.LDKSocketDescriptor_get_obj_from_jcalls(other_arg).hash() == 1; } + @Override public boolean eq(long other_arg) { boolean ret = bindings.SocketDescriptor_hash(other_arg) == 1; bindings.SocketDescriptor_free(other_arg); return ret; } @Override public long hash() { return 1; } }; descriptor1.val = bindings.LDKSocketDescriptor_new(sock2); @@ -233,27 +238,19 @@ public class PeerTest { funding.getInputs().get(0).setWitness(new TransactionWitness(2)); // Make sure we don't complain about lack of witness funding.getInput(0).getWitness().setPush(0, new byte[] {0x1}); funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk)); - long funding_txo = bindings.OutPoint_new(funding.getTxId().getReversedBytes(), (short) 0); - bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding_txo); - bindings.OutPoint_free(funding_txo); + bindings.ChannelManager_funding_transaction_generated(peer1.chan_manager, chan_id, funding.bitcoinSerialize(), (short)0); bindings.PeerManager_process_events(peer1.peer_manager); while (!list.isEmpty()) { list.poll().join(); } bindings.PeerManager_process_events(peer2.peer_manager); while (!list.isEmpty()) { list.poll().join(); } - events = bindings.EventsProvider_get_and_clear_pending_events(peer1.chan_manager_events); - assert events.length == 1; - event = bindings.LDKEvent_ref_from_ptr(events[0]); - assert event instanceof bindings.LDKEvent.FundingBroadcastSafe; - bindings.CVec_EventZ_free(events); - Block b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding})); peer1.connect_block(b, funding, 1); peer2.connect_block(b, funding, 1); for (int height = 2; height < 10; height++) { - b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[]{funding})); + b = new Block(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), 2, b.getHash(), Sha256Hash.ZERO_HASH, 42, 0, 0, Arrays.asList(new Transaction[0])); peer1.connect_block(b, null, height); peer2.connect_block(b, null, height); } @@ -276,7 +273,7 @@ public class PeerTest { for (int i = 0; i < 32; i++) payment_preimage[i] = (byte) (i ^ 0x0f); byte[] payment_hash = Sha256Hash.hash(payment_preimage); long netgraph = bindings.NetGraphMsgHandler_read_locked_graph(peer1.router); - long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, peer1_chans, + long route = bindings.get_route(peer1.node_id, bindings.LockedNetworkGraph_graph(netgraph), peer2.node_id, 0L, peer1_chans, new long[0], 1000, 42, peer1.logger); for (long chan : peer1_chans) bindings.ChannelDetails_free(chan); assert bindings.LDKCResult_RouteLightningErrorZ_result_ok(route);