projects
/
ldk-java
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c3ae2d6
)
Update tests to new enum API
2021-03-fix-enums
author
Matt Corallo
<git@bluematt.me>
Tue, 30 Mar 2021 01:55:40 +0000
(21:55 -0400)
committer
Matt Corallo
<git@bluematt.me>
Tue, 30 Mar 2021 20:01:24 +0000
(16:01 -0400)
src/test/java/org/ldk/HumanObjectPeerTest.java
patch
|
blob
|
history
diff --git
a/src/test/java/org/ldk/HumanObjectPeerTest.java
b/src/test/java/org/ldk/HumanObjectPeerTest.java
index a0879869ff8355c8b1d80c8b8d710315ec0cdc94..5694bcf81cd16a503fbfd85c0d85c37d37f023eb 100644
(file)
--- a/
src/test/java/org/ldk/HumanObjectPeerTest.java
+++ b/
src/test/java/org/ldk/HumanObjectPeerTest.java
@@
-126,7
+126,7
@@
class HumanObjectPeerTestInstance {
synchronized (monitors) {
assert monitors.put(Arrays.toString(funding_txo.get_txid()), monitor) == null;
}
synchronized (monitors) {
assert monitors.put(Arrays.toString(funding_txo.get_txid()), monitor) == null;
}
- return
new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK
();
+ return
Result_NoneChannelMonitorUpdateErrZ.constructor_ok
();
}
public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) {
}
public Result_NoneChannelMonitorUpdateErrZ update_channel(OutPoint funding_txo, ChannelMonitorUpdate update) {
@@
-136,7
+136,7
@@
class HumanObjectPeerTestInstance {
Result_NoneMonitorUpdateErrorZ update_res = monitors.get(txid).update_monitor(update, tx_broadcaster, fee_estimator, logger);
assert update_res instanceof Result_NoneMonitorUpdateErrorZ.Result_NoneMonitorUpdateErrorZ_OK;
}
Result_NoneMonitorUpdateErrorZ update_res = monitors.get(txid).update_monitor(update, tx_broadcaster, fee_estimator, logger);
assert update_res instanceof Result_NoneMonitorUpdateErrorZ.Result_NoneMonitorUpdateErrorZ_OK;
}
- return
new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK
();
+ return
Result_NoneChannelMonitorUpdateErrZ.constructor_ok
();
}
@Override
}
@Override
@@
-205,7
+205,7
@@
class HumanObjectPeerTestInstance {
assert Arrays.equals(res.a.get_txid(), id.get_txid());
assert res.a.get_index() == id.get_index();
}
assert Arrays.equals(res.a.get_txid(), id.get_txid());
assert res.a.get_index() == id.get_index();
}
- return
new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK
();
+ return
Result_NoneChannelMonitorUpdateErrZ.constructor_ok
();
}
@Override
}
@Override
@@
-217,7
+217,7
@@
class HumanObjectPeerTestInstance {
assert Arrays.equals(res.a.get_txid(), id.get_txid());
assert res.a.get_index() == id.get_index();
}
assert Arrays.equals(res.a.get_txid(), id.get_txid());
assert res.a.get_index() == id.get_index();
}
- return
new Result_NoneChannelMonitorUpdateErrZ.Result_NoneChannelMonitorUpdateErrZ_OK
();
+ return
Result_NoneChannelMonitorUpdateErrZ.constructor_ok
();
}
});
}
});
@@
-227,8
+227,9
@@
class HumanObjectPeerTestInstance {
@Override public void register_tx(byte[] txid, byte[] script_pubkey) {
filter_additions.add(Arrays.toString(txid));
}
@Override public void register_tx(byte[] txid, byte[] script_pubkey) {
filter_additions.add(Arrays.toString(txid));
}
- @Override public void register_output(OutPoint outpoint, byte[] script_pubkey) {
- filter_additions.add(Arrays.toString(outpoint.get_txid()) + ":" + outpoint.get_index());
+ @Override public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) {
+ filter_additions.add(Arrays.toString(output.get_outpoint().get_txid()) + ":" + output.get_outpoint().get_index());
+ return Option_C2Tuple_usizeTransactionZZ.constructor_none();
}
});
} else {
}
});
} else {
@@
-549,12
+550,15
@@
class HumanObjectPeerTestInstance {
wait_events_processed(peer1, peer2);
peer1.chan_manager.list_channels();
wait_events_processed(peer1, peer2);
peer1.chan_manager.list_channels();
- ChannelDetails[] peer1_chans = peer1.chan_manager.list_channels();
- ChannelDetails[] peer2_chans = peer2.chan_manager.list_channels();
+ ChannelDetails[] peer1_chans = peer1.chan_manager.list_
usable_
channels();
+ ChannelDetails[] peer2_chans = peer2.chan_manager.list_
usable_
channels();
assert peer1_chans.length == 1;
assert peer2_chans.length == 1;
assert peer1_chans[0].get_channel_value_satoshis() == 10000;
assert peer1_chans[0].get_is_live();
assert peer1_chans.length == 1;
assert peer2_chans.length == 1;
assert peer1_chans[0].get_channel_value_satoshis() == 10000;
assert peer1_chans[0].get_is_live();
+ Option_u64Z short_chan_id = peer1_chans[0].get_short_channel_id();
+ assert short_chan_id instanceof Option_u64Z.Some;
+ assert ((Option_u64Z.Some)short_chan_id).some == (1L << 40); // 0th output in the 0th transaction in the 1st block
assert Arrays.equals(peer1_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
assert Arrays.equals(peer2_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
assert Arrays.equals(peer1_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());
assert Arrays.equals(peer2_chans[0].get_channel_id(), funding.getTxId().getReversedBytes());