X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=c532b8136dcf7fe9203efe67e8016f203f413605;hb=e6b040d51589d726cb506830e2b0e0363f411634;hp=6a2bb5605e18a42b42cb3872e5a803ed79855ee9;hpb=cac55d22d66825a31433c59cddb1817c0bdab5f3;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 6a2bb56..c532b81 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -438,6 +438,10 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 					new_path = format!("{}::{}{}", crate_name, $ident, $path_suffix);
 					let crate_name_ident = format_ident!("{}", crate_name);
 					path.push(parse_quote!(#crate_name_ident));
+				} else if format!("{}", $ident) == "self" {
+					let mut path_iter = partial_path.rsplitn(2, "::");
+					path_iter.next().unwrap();
+					new_path = path_iter.next().unwrap().to_owned();
 				} else {
 					new_path = format!("{}{}{}", partial_path, $ident, $path_suffix);
 				}
@@ -452,7 +456,8 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 			},
 			syn::UseTree::Name(n) => {
 				push_path!(n.ident, "");
-				imports.insert(n.ident.clone(), (new_path, syn::Path { leading_colon: Some(syn::Token![::](Span::call_site())), segments: path }));
+				let imported_ident = syn::Ident::new(new_path.rsplitn(2, "::").next().unwrap(), Span::call_site());
+				imports.insert(imported_ident, (new_path, syn::Path { leading_colon: Some(syn::Token![::](Span::call_site())), segments: path }));
 			},
 			syn::UseTree::Group(g) => {
 				for i in g.items.iter() {
@@ -711,6 +716,10 @@ impl FullLibraryAST {
 fn initial_clonable_types() -> HashSet<String> {
 	let mut res = HashSet::new();
 	res.insert("crate::c_types::u5".to_owned());
+	res.insert("crate::c_types::FourBytes".to_owned());
+	res.insert("crate::c_types::TwelveBytes".to_owned());
+	res.insert("crate::c_types::SixteenBytes".to_owned());
+	res.insert("crate::c_types::TwentyBytes".to_owned());
 	res.insert("crate::c_types::ThirtyTwoBytes".to_owned());
 	res.insert("crate::c_types::SecretKey".to_owned());
 	res.insert("crate::c_types::PublicKey".to_owned());
@@ -718,8 +727,17 @@ fn initial_clonable_types() -> HashSet<String> {
 	res.insert("crate::c_types::TxOut".to_owned());
 	res.insert("crate::c_types::Signature".to_owned());
 	res.insert("crate::c_types::RecoverableSignature".to_owned());
+	res.insert("crate::c_types::Bech32Error".to_owned());
 	res.insert("crate::c_types::Secp256k1Error".to_owned());
 	res.insert("crate::c_types::IOError".to_owned());
+	res.insert("crate::c_types::Error".to_owned());
+	res.insert("crate::c_types::Str".to_owned());
+
+	// Because some types are manually-mapped to CVec_u8Z we may end up checking if its clonable
+	// before we ever get to constructing the type fully via
+	// `write_c_mangled_container_path_intern` (which will add it here too), so we have to manually
+	// add it on startup.
+	res.insert("crate::c_types::derived::CVec_u8Z".to_owned());
 	res
 }
 
@@ -827,7 +845,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 	/// Returns true we if can just skip passing this to C entirely
 	fn no_arg_path_to_rust(&self, full_path: &str) -> &str {
 		if full_path == "bitcoin::secp256k1::Secp256k1" {
-			"secp256k1::SECP256K1"
+			"secp256k1::global::SECP256K1"
 		} else { unimplemented!(); }
 	}
 
@@ -874,7 +892,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"std::time::Duration"|"core::time::Duration" => Some("u64"),
 			"std::time::SystemTime" => Some("u64"),
-			"std::io::Error" => Some("crate::c_types::IOError"),
+			"std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError"),
 			"core::fmt::Arguments" if is_ref => Some("crate::c_types::Str"),
 
 			"core::convert::Infallible" => Some("crate::c_types::NotConstructable"),
@@ -890,20 +908,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::bech32::u5"|"bech32::u5" => Some("crate::c_types::u5"),
 			"core::num::NonZeroU8" => Some("u8"),
 
-			"bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"|"secp256k1::key::PublicKey"
-				=> Some("crate::c_types::PublicKey"),
-			"bitcoin::secp256k1::Signature" => Some("crate::c_types::Signature"),
-			"bitcoin::secp256k1::recovery::RecoverableSignature" => Some("crate::c_types::RecoverableSignature"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if is_ref  => Some("*const [u8; 32]"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if !is_ref => Some("crate::c_types::SecretKey"),
+			"secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some("crate::c_types::PublicKey"),
+			"bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::Signature"),
+			"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature"),
+			"bitcoin::secp256k1::SecretKey" if is_ref  => Some("*const [u8; 32]"),
+			"bitcoin::secp256k1::SecretKey" if !is_ref => Some("crate::c_types::SecretKey"),
 			"bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice"),
 			"bitcoin::blockdata::script::Script" if !is_ref => Some("crate::c_types::derived::CVec_u8Z"),
 			"bitcoin::blockdata::transaction::OutPoint" => Some("crate::lightning::chain::transaction::OutPoint"),
 			"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some("crate::c_types::Transaction"),
 			"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some("crate::c_types::TxOut"),
 			"bitcoin::network::constants::Network" => Some("crate::bitcoin::network::Network"),
+			"bitcoin::util::address::WitnessVersion" => Some("crate::c_types::WitnessVersion"),
 			"bitcoin::blockdata::block::BlockHeader" if is_ref  => Some("*const [u8; 80]"),
 			"bitcoin::blockdata::block::Block" if is_ref  => Some("crate::c_types::u8slice"),
 
@@ -957,7 +973,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"str" if is_ref => Some(""),
 			"alloc::string::String"|"String" => Some(""),
-			"std::io::Error" if !is_ref => Some(""),
+			"std::io::Error"|"lightning::io::Error" => Some(""),
 			// Note that we'll panic for String if is_ref, as we only have non-owned memory, we
 			// cannot create a &String.
 
@@ -975,17 +991,13 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::bech32::u5"|"bech32::u5" => Some(""),
 			"core::num::NonZeroU8" => Some("core::num::NonZeroU8::new("),
 
-			"bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"|"secp256k1::key::PublicKey"
-				if is_ref => Some("&"),
-			"bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"|"secp256k1::key::PublicKey"
-				=> Some(""),
-			"bitcoin::secp256k1::Signature" if is_ref => Some("&"),
-			"bitcoin::secp256k1::Signature" => Some(""),
-			"bitcoin::secp256k1::recovery::RecoverableSignature" => Some(""),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if is_ref => Some("&::bitcoin::secp256k1::key::SecretKey::from_slice(&unsafe { *"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if !is_ref => Some(""),
+			"bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" if is_ref => Some("&"),
+			"bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(""),
+			"bitcoin::secp256k1::ecdsa::Signature" if is_ref => Some("&"),
+			"bitcoin::secp256k1::ecdsa::Signature" => Some(""),
+			"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(""),
+			"bitcoin::secp256k1::SecretKey" if is_ref => Some("&::bitcoin::secp256k1::SecretKey::from_slice(&unsafe { *"),
+			"bitcoin::secp256k1::SecretKey" if !is_ref => Some(""),
 			"bitcoin::blockdata::script::Script" if is_ref => Some("&::bitcoin::blockdata::script::Script::from(Vec::from("),
 			"bitcoin::blockdata::script::Script" if !is_ref => Some("::bitcoin::blockdata::script::Script::from("),
 			"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("&"),
@@ -993,6 +1005,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::blockdata::transaction::OutPoint" => Some("crate::c_types::C_to_bitcoin_outpoint("),
 			"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(""),
 			"bitcoin::network::constants::Network" => Some(""),
+			"bitcoin::util::address::WitnessVersion" => Some(""),
 			"bitcoin::blockdata::block::BlockHeader" => Some("&::bitcoin::consensus::encode::deserialize(unsafe { &*"),
 			"bitcoin::blockdata::block::Block" if is_ref => Some("&::bitcoin::consensus::encode::deserialize("),
 
@@ -1047,7 +1060,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"str" if is_ref => Some(".into_str()"),
 			"alloc::string::String"|"String" => Some(".into_string()"),
-			"std::io::Error" if !is_ref => Some(".to_rust()"),
+			"std::io::Error"|"lightning::io::Error" => Some(".to_rust()"),
 
 			"core::convert::Infallible" => Some("\")"),
 
@@ -1063,20 +1076,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
 			"core::num::NonZeroU8" => Some(").expect(\"Value must be non-zero\")"),
 
-			"bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"|"secp256k1::key::PublicKey"
-				=> Some(".into_rust()"),
-			"bitcoin::secp256k1::Signature" => Some(".into_rust()"),
-			"bitcoin::secp256k1::recovery::RecoverableSignature" => Some(".into_rust()"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if !is_ref => Some(".into_rust()"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if is_ref => Some("}[..]).unwrap()"),
+			"bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(".into_rust()"),
+			"bitcoin::secp256k1::ecdsa::Signature" => Some(".into_rust()"),
+			"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(".into_rust()"),
+			"bitcoin::secp256k1::SecretKey" if !is_ref => Some(".into_rust()"),
+			"bitcoin::secp256k1::SecretKey" if is_ref => Some("}[..]).unwrap()"),
 			"bitcoin::blockdata::script::Script" if is_ref => Some(".to_slice()))"),
 			"bitcoin::blockdata::script::Script" if !is_ref => Some(".into_rust())"),
 			"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(".into_bitcoin()"),
 			"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
 			"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(".into_rust()"),
 			"bitcoin::network::constants::Network" => Some(".into_bitcoin()"),
+			"bitcoin::util::address::WitnessVersion" => Some(".into()"),
 			"bitcoin::blockdata::block::BlockHeader" => Some(" }).unwrap()"),
 			"bitcoin::blockdata::block::Block" => Some(".to_slice()).unwrap()"),
 
@@ -1142,7 +1153,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"std::time::Duration"|"core::time::Duration" => Some(""),
 			"std::time::SystemTime" => Some(""),
-			"std::io::Error" if !is_ref => Some("crate::c_types::IOError::from_rust("),
+			"std::io::Error"|"lightning::io::Error" => Some("crate::c_types::IOError::from_rust("),
 			"core::fmt::Arguments" => Some("alloc::format!(\"{}\", "),
 
 			"core::convert::Infallible" => Some("panic!(\"Cannot construct an Infallible: "),
@@ -1157,14 +1168,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"bitcoin::bech32::u5"|"bech32::u5" => Some(""),
 
-			"bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"|"secp256k1::key::PublicKey"
-				=> Some("crate::c_types::PublicKey::from_rust(&"),
-			"bitcoin::secp256k1::Signature" => Some("crate::c_types::Signature::from_rust(&"),
-			"bitcoin::secp256k1::recovery::RecoverableSignature" => Some("crate::c_types::RecoverableSignature::from_rust(&"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if is_ref => Some(""),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
+			"bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some("crate::c_types::PublicKey::from_rust(&"),
+			"bitcoin::secp256k1::ecdsa::Signature" => Some("crate::c_types::Signature::from_rust(&"),
+			"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some("crate::c_types::RecoverableSignature::from_rust(&"),
+			"bitcoin::secp256k1::SecretKey" if is_ref => Some(""),
+			"bitcoin::secp256k1::SecretKey" if !is_ref => Some("crate::c_types::SecretKey::from_rust("),
 			"bitcoin::blockdata::script::Script" if is_ref => Some("crate::c_types::u8slice::from_slice(&"),
 			"bitcoin::blockdata::script::Script" if !is_ref => Some(""),
 			"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" if is_ref => Some("crate::c_types::Transaction::from_bitcoin("),
@@ -1172,6 +1180,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"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::util::address::WitnessVersion" => Some(""),
 			"bitcoin::blockdata::block::BlockHeader" if is_ref => Some("&local_"),
 			"bitcoin::blockdata::block::Block" if is_ref => Some("crate::c_types::u8slice::from_slice(&local_"),
 
@@ -1221,7 +1230,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"std::time::Duration"|"core::time::Duration" => Some(".as_secs()"),
 			"std::time::SystemTime" => Some(".duration_since(::std::time::SystemTime::UNIX_EPOCH).expect(\"Times must be post-1970\").as_secs()"),
-			"std::io::Error" if !is_ref => Some(")"),
+			"std::io::Error"|"lightning::io::Error" => Some(")"),
 			"core::fmt::Arguments" => Some(").into()"),
 
 			"core::convert::Infallible" => Some("\")"),
@@ -1236,20 +1245,18 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 			"bitcoin::bech32::u5"|"bech32::u5" => Some(".into()"),
 
-			"bitcoin::secp256k1::key::PublicKey"|"bitcoin::secp256k1::PublicKey"|"secp256k1::key::PublicKey"
-				=> Some(")"),
-			"bitcoin::secp256k1::Signature" => Some(")"),
-			"bitcoin::secp256k1::recovery::RecoverableSignature" => Some(")"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if !is_ref => Some(")"),
-			"bitcoin::secp256k1::key::SecretKey"|"bitcoin::secp256k1::SecretKey"
-				if is_ref => Some(".as_ref()"),
+			"bitcoin::secp256k1::PublicKey"|"secp256k1::PublicKey" => Some(")"),
+			"bitcoin::secp256k1::ecdsa::Signature" => Some(")"),
+			"bitcoin::secp256k1::ecdsa::RecoverableSignature" => Some(")"),
+			"bitcoin::secp256k1::SecretKey" if !is_ref => Some(")"),
+			"bitcoin::secp256k1::SecretKey" if is_ref => Some(".as_ref()"),
 			"bitcoin::blockdata::script::Script" if is_ref => Some("[..])"),
 			"bitcoin::blockdata::script::Script" if !is_ref => Some(".into_bytes().into()"),
 			"bitcoin::blockdata::transaction::Transaction"|"bitcoin::Transaction" => Some(")"),
 			"bitcoin::blockdata::transaction::OutPoint" => Some(")"),
 			"bitcoin::blockdata::transaction::TxOut" if !is_ref => Some(")"),
 			"bitcoin::network::constants::Network" => Some(")"),
+			"bitcoin::util::address::WitnessVersion" => Some(".into()"),
 			"bitcoin::blockdata::block::BlockHeader" if is_ref => Some(""),
 			"bitcoin::blockdata::block::Block" if is_ref => Some(")"),
 
@@ -1277,8 +1284,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 	fn empty_val_check_suffix_from_path(&self, full_path: &str) -> Option<&str> {
 		match full_path {
 			"lightning::ln::PaymentSecret" => Some(".data == [0; 32]"),
-			"secp256k1::key::PublicKey"|"bitcoin::secp256k1::key::PublicKey" => Some(".is_null()"),
-			"bitcoin::secp256k1::Signature" => Some(".is_null()"),
+			"secp256k1::PublicKey"|"bitcoin::secp256k1::PublicKey" => Some(".is_null()"),
+			"bitcoin::secp256k1::ecdsa::Signature" => Some(".is_null()"),
 			_ => None
 		}
 	}
@@ -1501,7 +1508,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 
 				if let Some(t) = single_contained {
 					match t {
-						syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_) => {
+						syn::Type::Reference(_)|syn::Type::Path(_)|syn::Type::Slice(_)|syn::Type::Array(_) => {
 							let mut v = Vec::new();
 							let ret_ref = self.write_empty_rust_val_check_suffix(generics, &mut v, t);
 							let s = String::from_utf8(v).unwrap();
@@ -1797,7 +1804,6 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			syn::Type::Path(p) => {
 				let resolved = self.resolve_path(&p.path, generics);
 				if let Some(arr_ty) = self.is_real_type_array(&resolved) {
-					write!(w, ".data").unwrap();
 					return self.write_empty_rust_val_check_suffix(generics, w, &arr_ty);
 				}
 				if self.crate_types.opaques.get(&resolved).is_some() {
@@ -1817,7 +1823,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			syn::Type::Array(a) => {
 				if let syn::Expr::Lit(l) = &a.len {
 					if let syn::Lit::Int(i) = &l.lit {
-						write!(w, " == [0; {}]", i.base10_digits()).unwrap();
+						write!(w, ".data == [0; {}]", i.base10_digits()).unwrap();
 						EmptyValExpectedTy::NonPointer
 					} else { unimplemented!(); }
 				} else { unimplemented!(); }