X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelKeys.ts;h=600fe24f2e329602c132bfced117c14c2ba44701;hb=4f914d250ae903770128765403d62ce3d8f54126;hp=39431b4edde3492f694445514c4b9cb14f79d098;hpb=739c980d19c6c04538b739c680024c5083a10585;p=ldk-java

diff --git a/ts/structs/ChannelKeys.ts b/ts/structs/ChannelKeys.ts
index 39431b4e..600fe24f 100644
--- a/ts/structs/ChannelKeys.ts
+++ b/ts/structs/ChannelKeys.ts
@@ -1,111 +1,3 @@
-
-import CommonBase from './CommonBase';
-import * as bindings from '../bindings' // TODO: figure out location
-
-public class ChannelKeys extends CommonBase {
-	final bindings.LDKChannelKeys bindings_instance;
-	ChannelKeys(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }
-	private ChannelKeys(bindings.LDKChannelKeys arg, ChannelPublicKeys pubkeys) {
-		super(bindings.LDKChannelKeys_new(arg, pubkeys == null ? 0 : pubkeys.ptr & ~1));
-		this.ptrs_to.add(arg);
-		this.ptrs_to.add(pubkeys);
-		this.bindings_instance = arg;
-	}
-	@Override @SuppressWarnings("deprecation")
-	protected void finalize() throws Throwable {
-		if (ptr != 0) { bindings.ChannelKeys_free(ptr); } super.finalize();
-	}
-
-	public static interface ChannelKeysInterface {
-		byte[] get_per_commitment_point(long idx);
-		byte[] release_commitment_secret(long idx);
-		TwoTuple<Long, Long> key_derivation_params();
-		Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx);
-		Result_SignatureNoneZ sign_holder_commitment(HolderCommitmentTransaction commitment_tx);
-		Result_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions(HolderCommitmentTransaction commitment_tx);
-		Result_SignatureNoneZ sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc);
-		Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc);
-		Result_SignatureNoneZ sign_closing_transaction(byte[] closing_tx);
-		Result_SignatureNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg);
-		void ready_channel(ChannelTransactionParameters channel_parameters);
-		byte[] write();
-	}
-	private static class LDKChannelKeysHolder { ChannelKeys held; }
-	public static ChannelKeys new_impl(ChannelKeysInterface arg, ChannelPublicKeys pubkeys) {
-		final LDKChannelKeysHolder impl_holder = new LDKChannelKeysHolder();
-		impl_holder.held = new ChannelKeys(new bindings.LDKChannelKeys() {
-			@Override public byte[] get_per_commitment_point(long idx) {
-				byte[] ret = arg.get_per_commitment_point(idx);
-				return ret;
-			}
-			@Override public byte[] release_commitment_secret(long idx) {
-				byte[] ret = arg.release_commitment_secret(idx);
-				return ret;
-			}
-			@Override public uint32_t key_derivation_params() {
-				TwoTuple<Long, Long> ret = arg.key_derivation_params();
-				uint32_t result = bindings.C2Tuple_u64u64Z_new(ret.a, ret.b);
-				return result;
-			}
-			@Override public uint32_t sign_counterparty_commitment(uint32_t commitment_tx) {
-				CommitmentTransaction commitment_tx_hu_conv = new CommitmentTransaction(null, commitment_tx);
-				Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_counterparty_commitment(commitment_tx_hu_conv);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public uint32_t sign_holder_commitment(uint32_t commitment_tx) {
-				HolderCommitmentTransaction commitment_tx_hu_conv = new HolderCommitmentTransaction(null, commitment_tx);
-				Result_SignatureNoneZ ret = arg.sign_holder_commitment(commitment_tx_hu_conv);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public uint32_t sign_holder_commitment_htlc_transactions(uint32_t commitment_tx) {
-				HolderCommitmentTransaction commitment_tx_hu_conv = new HolderCommitmentTransaction(null, commitment_tx);
-				Result_CVec_SignatureZNoneZ ret = arg.sign_holder_commitment_htlc_transactions(commitment_tx_hu_conv);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public uint32_t sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, uint32_t htlc) {
-				HTLCOutputInCommitment htlc_hu_conv = new HTLCOutputInCommitment(null, htlc);
-				Result_SignatureNoneZ ret = arg.sign_justice_transaction(justice_tx, input, amount, per_commitment_key, htlc_hu_conv);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public uint32_t sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, uint32_t htlc) {
-				HTLCOutputInCommitment htlc_hu_conv = new HTLCOutputInCommitment(null, htlc);
-				Result_SignatureNoneZ ret = arg.sign_counterparty_htlc_transaction(htlc_tx, input, amount, per_commitment_point, htlc_hu_conv);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public uint32_t sign_closing_transaction(byte[] closing_tx) {
-				Result_SignatureNoneZ ret = arg.sign_closing_transaction(closing_tx);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public uint32_t sign_channel_announcement(uint32_t msg) {
-				UnsignedChannelAnnouncement msg_hu_conv = new UnsignedChannelAnnouncement(null, msg);
-				Result_SignatureNoneZ ret = arg.sign_channel_announcement(msg_hu_conv);
-				uint32_t result = ret != null ? ret.ptr : 0;
-				ret.ptr = 0;
-				return result;
-			}
-			@Override public void ready_channel(uint32_t channel_parameters) {
-				ChannelTransactionParameters channel_parameters_hu_conv = new ChannelTransactionParameters(null, channel_parameters);
-				arg.ready_channel(channel_parameters_hu_conv);
-			}
-			@Override public byte[] write() {
-				byte[] ret = arg.write();
-				return ret;
-			}
-		}, pubkeys);
-		return impl_holder.held;
-	}
 	public byte[] get_per_commitment_point(long idx) {
 		byte[] ret = bindings.ChannelKeys_get_per_commitment_point(this.ptr, idx);
 		return ret;