Merge pull request #2 from TheBlueMatt/main

[ldk-java] / ts / structs / SpendableOutputDescriptor.ts

diff --git a/ts/structs/SpendableOutputDescriptor.ts b/ts/structs/SpendableOutputDescriptor.ts
index 005b9741b6f967c585df9e2ef3c46203ac57381d..b2481d75d6f97322db917c3c8f5e155676f0f92a 100644 (file)
--- a/ts/structs/SpendableOutputDescriptor.ts
+++ b/ts/structs/SpendableOutputDescriptor.ts
@@ -13,11 +13,11 @@ export default class SpendableOutputDescriptor extends CommonBase {
                if (raw_val instanceof bindings.LDKSpendableOutputDescriptor.StaticOutput) {
                        return new StaticOutput(this.ptr, raw_val);
                }
-               if (raw_val instanceof bindings.LDKSpendableOutputDescriptor.DynamicOutputP2WSH) {
-                       return new DynamicOutputP2WSH(this.ptr, raw_val);
+               if (raw_val instanceof bindings.LDKSpendableOutputDescriptor.DelayedPaymentOutput) {
+                       return new DelayedPaymentOutput(this.ptr, raw_val);
                }
-               if (raw_val instanceof bindings.LDKSpendableOutputDescriptor.StaticOutputCounterpartyPayment) {
-                       return new StaticOutputCounterpartyPayment(this.ptr, raw_val);
+               if (raw_val instanceof bindings.LDKSpendableOutputDescriptor.StaticPaymentOutput) {
+                       return new StaticPaymentOutput(this.ptr, raw_val);
                }
                throw new Error('oops, this should be unreachable'); // Unreachable without extending the (internal) bindings interface
        }
@@ -37,53 +37,13 @@ export class StaticOutput extends SpendableOutputDescriptor {
                this.output = output_conv;
        }
 }
-export class DynamicOutputP2WSH extends SpendableOutputDescriptor {
-       public outpoint: OutPoint;
-       public per_commitment_point: Uint8Array;
-       public to_self_delay: number;
-       public output: TxOut;
-       public key_derivation_params: TwoTuple<Number, Number>;
-       public revocation_pubkey: Uint8Array;
-       private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.DynamicOutputP2WSH) {
+export class DelayedPaymentOutput extends SpendableOutputDescriptor {
+       private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.DelayedPaymentOutput) {
                super(null, ptr);
-               const outpoint: number = obj.outpoint;
-               const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint);
-                       outpoint_hu_conv.ptrs_to.add(this);
-               this.outpoint = outpoint_hu_conv;
-               this.per_commitment_point = obj.per_commitment_point;
-               this.to_self_delay = obj.to_self_delay;
-               const output: number = obj.output;
-               TxOut output_conv = new TxOut(null, output);
-               this.output = output_conv;
-               const key_derivation_params: number = obj.key_derivation_params;
-               number key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
-                       number key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
-                       TwoTuple<Number, Number> key_derivation_params_conv = new TwoTuple<Number, Number>(key_derivation_params_a, key_derivation_params_b, () -> {
-                               bindings.C2Tuple_u64u64Z_free(key_derivation_params);
-                       });
-               this.key_derivation_params = key_derivation_params_conv;
-               this.revocation_pubkey = obj.revocation_pubkey;
        }
 }
-export class StaticOutputCounterpartyPayment extends SpendableOutputDescriptor {
-       public outpoint: OutPoint;
-       public output: TxOut;
-       public key_derivation_params: TwoTuple<Number, Number>;
-       private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.StaticOutputCounterpartyPayment) {
+export class StaticPaymentOutput extends SpendableOutputDescriptor {
+       private constructor(ptr: number, obj: bindings.LDKSpendableOutputDescriptor.StaticPaymentOutput) {
                super(null, ptr);
-               const outpoint: number = obj.outpoint;
-               const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint);
-                       outpoint_hu_conv.ptrs_to.add(this);
-               this.outpoint = outpoint_hu_conv;
-               const output: number = obj.output;
-               TxOut output_conv = new TxOut(null, output);
-               this.output = output_conv;
-               const key_derivation_params: number = obj.key_derivation_params;
-               number key_derivation_params_a = bindings.LDKC2Tuple_u64u64Z_get_a(key_derivation_params);
-                       number key_derivation_params_b = bindings.LDKC2Tuple_u64u64Z_get_b(key_derivation_params);
-                       TwoTuple<Number, Number> key_derivation_params_conv = new TwoTuple<Number, Number>(key_derivation_params_a, key_derivation_params_b, () -> {
-                               bindings.C2Tuple_u64u64Z_free(key_derivation_params);
-                       });
-               this.key_derivation_params = key_derivation_params_conv;
        }
 }