X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FRouteHop.ts;h=af9e0616336880c532ef2cedd274c4def631f52c;hb=e405a314197cae1629f65ccf29c6966198f8f4f7;hp=f03f698946c28badb6ab6702ea519b94eee9c016;hpb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;p=ldk-java

diff --git a/ts/structs/RouteHop.ts b/ts/structs/RouteHop.ts
index f03f6989..af9e0616 100644
--- a/ts/structs/RouteHop.ts
+++ b/ts/structs/RouteHop.ts
@@ -18,20 +18,13 @@ import * as bindings from '../bindings' // TODO: figure out location
                         bindings.RouteHop_free(this.ptr);
                     }
                 }
-	public RouteHop clone() {
-		number ret = bindings.RouteHop_clone(this.ptr);
-		const ret_hu_conv: RouteHop = new RouteHop(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
-		return ret_hu_conv;
-	}
-
 	public Uint8Array get_pubkey() {
 		Uint8Array ret = bindings.RouteHop_get_pubkey(this.ptr);
 		return ret;
 	}
 
 	public void set_pubkey(Uint8Array val) {
-		bindings.RouteHop_set_pubkey(this.ptr, val);
+		bindings.RouteHop_set_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	public NodeFeatures get_node_features() {
@@ -43,15 +36,6 @@ import * as bindings from '../bindings' // TODO: figure out location
 
 	public void set_node_features(NodeFeatures val) {
 		bindings.RouteHop_set_node_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
-		// Due to rust's strict-ownership memory model, in some cases we need to "move"
-		// an object to pass exclusive ownership to the function being called.
-		// In most cases, we avoid this being visible in GC'd languages by cloning the object
-		// at the FFI layer, creating a new object which Rust can claim ownership of
-		// However, in some cases (eg here), there is no way to clone an object, and thus
-		// we actually have to pass full ownership to Rust.
-		// Thus, after this call, val is reset to null and is now a dummy object.
-		val.ptr = 0;
 	}
 
 	public number get_short_channel_id() {
@@ -72,15 +56,6 @@ import * as bindings from '../bindings' // TODO: figure out location
 
 	public void set_channel_features(ChannelFeatures val) {
 		bindings.RouteHop_set_channel_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
-		// Due to rust's strict-ownership memory model, in some cases we need to "move"
-		// an object to pass exclusive ownership to the function being called.
-		// In most cases, we avoid this being visible in GC'd languages by cloning the object
-		// at the FFI layer, creating a new object which Rust can claim ownership of
-		// However, in some cases (eg here), there is no way to clone an object, and thus
-		// we actually have to pass full ownership to Rust.
-		// Thus, after this call, val is reset to null and is now a dummy object.
-		val.ptr = 0;
 	}
 
 	public number get_fee_msat() {
@@ -102,27 +77,43 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public static RouteHop constructor_new(Uint8Array pubkey_arg, NodeFeatures node_features_arg, number short_channel_id_arg, ChannelFeatures channel_features_arg, number fee_msat_arg, number cltv_expiry_delta_arg) {
-		number ret = bindings.RouteHop_new(pubkey_arg, node_features_arg == null ? 0 : node_features_arg.ptr & ~1, short_channel_id_arg, channel_features_arg == null ? 0 : channel_features_arg.ptr & ~1, fee_msat_arg, cltv_expiry_delta_arg);
+		number ret = bindings.RouteHop_new(InternalUtils.check_arr_len(pubkey_arg, 33), node_features_arg == null ? 0 : node_features_arg.ptr & ~1, short_channel_id_arg, channel_features_arg == null ? 0 : channel_features_arg.ptr & ~1, fee_msat_arg, cltv_expiry_delta_arg);
 		const ret_hu_conv: RouteHop = new RouteHop(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(node_features_arg);
-		// Due to rust's strict-ownership memory model, in some cases we need to "move"
-		// an object to pass exclusive ownership to the function being called.
-		// In most cases, we avoid ret_hu_conv being visible in GC'd languages by cloning the object
-		// at the FFI layer, creating a new object which Rust can claim ownership of
-		// However, in some cases (eg here), there is no way to clone an object, and thus
-		// we actually have to pass full ownership to Rust.
-		// Thus, after ret_hu_conv call, node_features_arg is reset to null and is now a dummy object.
-		node_features_arg.ptr = 0;
-		ret_hu_conv.ptrs_to.add(channel_features_arg);
-		// Due to rust's strict-ownership memory model, in some cases we need to "move"
-		// an object to pass exclusive ownership to the function being called.
-		// In most cases, we avoid ret_hu_conv being visible in GC'd languages by cloning the object
-		// at the FFI layer, creating a new object which Rust can claim ownership of
-		// However, in some cases (eg here), there is no way to clone an object, and thus
-		// we actually have to pass full ownership to Rust.
-		// Thus, after ret_hu_conv call, channel_features_arg is reset to null and is now a dummy object.
-		channel_features_arg.ptr = 0;
+		return ret_hu_conv;
+	}
+
+	public number clone_ptr() {
+		number ret = bindings.RouteHop_clone_ptr(this.ptr);
+		return ret;
+	}
+
+	public RouteHop clone() {
+		number ret = bindings.RouteHop_clone(this.ptr);
+		const ret_hu_conv: RouteHop = new RouteHop(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public number hash() {
+		number ret = bindings.RouteHop_hash(this.ptr);
+		return ret;
+	}
+
+	public boolean eq(RouteHop b) {
+		boolean ret = bindings.RouteHop_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
+		this.ptrs_to.add(b);
+		return ret;
+	}
+
+	public Uint8Array write() {
+		Uint8Array ret = bindings.RouteHop_write(this.ptr);
+		return ret;
+	}
+
+	public static Result_RouteHopDecodeErrorZ constructor_read(Uint8Array ser) {
+		number ret = bindings.RouteHop_read(ser);
+		Result_RouteHopDecodeErrorZ ret_hu_conv = Result_RouteHopDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}