X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=c-bindings-gen%2Fsrc%2Ftypes.rs;fp=c-bindings-gen%2Fsrc%2Ftypes.rs;h=ad21b4c6bca53917685979c846021a03cdb45d7e;hb=c42ea50cc703f03465d52b5fccfc4a90466d9fea;hp=7fc7e4cd905cff8d1cc66cd39aba44988b38c535;hpb=b5d88a5422913a0a8950455c5f86764a042429d7;p=rust-lightning

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 7fc7e4cd..ad21b4c6 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -842,6 +842,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::blockdata::transaction::Transaction" => Some("crate::c_types::Transaction::from_vec(local_"),
 			"bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::bitcoin_to_C_outpoint("),
 			"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut::from_rust("),
+			"bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network::from_bitcoin("),
 			"bitcoin::blockdata::block::BlockHeader" if is_ref => Some("&local_"),
 			"bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice::from_slice(&local_"),
 
@@ -899,6 +900,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::blockdata::transaction::Transaction" => Some(")"),
 			"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
 			"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(")"),
+			"bitcoin::network::constants::Network" => Some(")"),
 			"bitcoin::blockdata::block::BlockHeader" if is_ref => Some(""),
 			"bitcoin::blockdata::block::Block" if is_ref => Some(")"),
 
@@ -1944,11 +1946,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 									if !self.write_c_path_intern(w, &$p_arg.path, generics, true, true, true) { return false; }
 								}
 							} else {
-								if $p_arg.path.segments.len() == 1 {
-									write!(w, "{}", $p_arg.path.segments.iter().next().unwrap().ident).unwrap();
-								} else {
-									return false;
-								}
+								write!(w, "{}", $p_arg.path.segments.last().unwrap().ident).unwrap();
 							}
 						} else if self.is_known_container(&subtype, is_ref) || self.is_transparent_container(&subtype, is_ref) {
 							if !self.write_c_mangled_container_path_intern(w, Self::path_to_generic_args(&$p_arg.path), generics,