X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c-bindings-gen%2Fsrc%2Ftypes.rs;h=9ef83f2a41a97221305f3aaeaecdf38f315ac712;hb=ddf74802a4421f1ea1e221d801b3c342a32fade4;hp=96ec894f3ee114b91b45ce88ed4e2dc586f8444c;hpb=8de7edb6a6beb2ab7213648a21c2c00c9bce6d2c;p=ldk-c-bindings

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 96ec894..9ef83f2 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -558,7 +558,6 @@ impl<'mod_lifetime, 'crate_lft: 'mod_lifetime> ImportResolver<'mod_lifetime, 'cr
 	pub fn resolve_imported_refs(&self, mut ty: syn::Type) -> syn::Type {
 		match &mut ty {
 			syn::Type::Path(p) => {
-eprintln!("rir {:?}", p);
 				if p.path.segments.len() != 1 { unimplemented!(); }
 				let mut args = p.path.segments[0].arguments.clone();
 				if let syn::PathArguments::AngleBracketed(ref mut generics) = &mut args {
@@ -812,6 +811,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" if is_ref => Some("crate::c_types::Str"),
 
 			"std::time::Duration" => Some("u64"),
+			"std::time::SystemTime" => Some("u64"),
 			"std::io::Error" => Some("crate::c_types::IOError"),
 
 			"bech32::u5" => Some("crate::c_types::u5"),
@@ -840,12 +840,12 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
 				if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 			"bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
-			"lightning::ln::channelmanager::PaymentHash" if is_ref => Some("*const [u8; 32]"),
-			"lightning::ln::channelmanager::PaymentHash" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
-			"lightning::ln::channelmanager::PaymentPreimage" if is_ref => Some("*const [u8; 32]"),
-			"lightning::ln::channelmanager::PaymentPreimage" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
-			"lightning::ln::channelmanager::PaymentSecret" if is_ref => Some("crate::c_types::ThirtyTwoBytes"),
-			"lightning::ln::channelmanager::PaymentSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
+			"lightning::ln::PaymentHash" if is_ref => Some("*const [u8; 32]"),
+			"lightning::ln::PaymentHash" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
+			"lightning::ln::PaymentPreimage" if is_ref => Some("*const [u8; 32]"),
+			"lightning::ln::PaymentPreimage" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
+			"lightning::ln::PaymentSecret" if is_ref => Some("crate::c_types::ThirtyTwoBytes"),
+			"lightning::ln::PaymentSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes"),
 
 			// Override the default since Records contain an fmt with a lifetime:
 			"lightning::util::logger::Record" => Some("*const std::os::raw::c_char"),
@@ -884,6 +884,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			// cannot create a &String.
 
 			"std::time::Duration" => Some("std::time::Duration::from_secs("),
+			"std::time::SystemTime" => Some("(::std::time::SystemTime::UNIX_EPOCH + std::time::Duration::from_secs("),
 
 			"bech32::u5" => Some(""),
 
@@ -910,11 +911,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::hash_types::Txid" if is_ref => Some("&::bitcoin::hash_types::Txid::from_slice(&unsafe { &*"),
 			"bitcoin::hash_types::Txid" if !is_ref => Some("::bitcoin::hash_types::Txid::from_slice(&"),
 			"bitcoin::hash_types::BlockHash" => Some("::bitcoin::hash_types::BlockHash::from_slice(&"),
-			"lightning::ln::channelmanager::PaymentHash" if !is_ref => Some("::lightning::ln::channelmanager::PaymentHash("),
-			"lightning::ln::channelmanager::PaymentHash" if is_ref => Some("&::lightning::ln::channelmanager::PaymentHash(unsafe { *"),
-			"lightning::ln::channelmanager::PaymentPreimage" if !is_ref => Some("::lightning::ln::channelmanager::PaymentPreimage("),
-			"lightning::ln::channelmanager::PaymentPreimage" if is_ref => Some("&::lightning::ln::channelmanager::PaymentPreimage(unsafe { *"),
-			"lightning::ln::channelmanager::PaymentSecret" => Some("::lightning::ln::channelmanager::PaymentSecret("),
+			"lightning::ln::PaymentHash" if !is_ref => Some("::lightning::ln::PaymentHash("),
+			"lightning::ln::PaymentHash" if is_ref => Some("&::lightning::ln::PaymentHash(unsafe { *"),
+			"lightning::ln::PaymentPreimage" if !is_ref => Some("::lightning::ln::PaymentPreimage("),
+			"lightning::ln::PaymentPreimage" if is_ref => Some("&::lightning::ln::PaymentPreimage(unsafe { *"),
+			"lightning::ln::PaymentSecret" => Some("::lightning::ln::PaymentSecret("),
 
 			// List of traits we map (possibly during processing of other files):
 			"crate::util::logger::Logger" => Some(""),
@@ -946,6 +947,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" if !is_ref => Some(".into_rust()).unwrap()"),
 
 			"std::time::Duration" => Some(")"),
+			"std::time::SystemTime" => Some("))"),
 
 			"bech32::u5" => Some(".into()"),
 
@@ -968,11 +970,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::hash_types::Txid" if is_ref => Some(" }[..]).unwrap()"),
 			"bitcoin::hash_types::Txid" => Some(".data[..]).unwrap()"),
 			"bitcoin::hash_types::BlockHash" if !is_ref => Some(".data[..]).unwrap()"),
-			"lightning::ln::channelmanager::PaymentHash" if !is_ref => Some(".data)"),
-			"lightning::ln::channelmanager::PaymentHash" if is_ref => Some(" })"),
-			"lightning::ln::channelmanager::PaymentPreimage" if !is_ref => Some(".data)"),
-			"lightning::ln::channelmanager::PaymentPreimage" if is_ref => Some(" })"),
-			"lightning::ln::channelmanager::PaymentSecret" => Some(".data)"),
+			"lightning::ln::PaymentHash" if !is_ref => Some(".data)"),
+			"lightning::ln::PaymentHash" if is_ref => Some(" })"),
+			"lightning::ln::PaymentPreimage" if !is_ref => Some(".data)"),
+			"lightning::ln::PaymentPreimage" if is_ref => Some(" })"),
+			"lightning::ln::PaymentSecret" => Some(".data)"),
 
 			// List of traits we map (possibly during processing of other files):
 			"crate::util::logger::Logger" => Some(""),
@@ -1023,6 +1025,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" => Some(""),
 
 			"std::time::Duration" => Some(""),
+			"std::time::SystemTime" => Some(""),
 			"std::io::Error" if !is_ref => Some("crate::c_types::IOError::from_rust("),
 
 			"bech32::u5" => Some(""),
@@ -1054,11 +1057,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
 				if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 			"bitcoin::secp256k1::Message" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
-			"lightning::ln::channelmanager::PaymentHash" if is_ref => Some("&"),
-			"lightning::ln::channelmanager::PaymentHash" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
-			"lightning::ln::channelmanager::PaymentPreimage" if is_ref => Some("&"),
-			"lightning::ln::channelmanager::PaymentPreimage" => Some("crate::c_types::ThirtyTwoBytes { data: "),
-			"lightning::ln::channelmanager::PaymentSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
+			"lightning::ln::PaymentHash" if is_ref => Some("&"),
+			"lightning::ln::PaymentHash" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
+			"lightning::ln::PaymentPreimage" if is_ref => Some("&"),
+			"lightning::ln::PaymentPreimage" => Some("crate::c_types::ThirtyTwoBytes { data: "),
+			"lightning::ln::PaymentSecret" if !is_ref => Some("crate::c_types::ThirtyTwoBytes { data: "),
 
 			// Override the default since Records contain an fmt with a lifetime:
 			"lightning::util::logger::Record" => Some("local_"),
@@ -1091,6 +1094,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" if is_ref => Some(".as_str().into()"),
 
 			"std::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(")"),
 
 			"bech32::u5" => Some(".into()"),
@@ -1121,11 +1125,11 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"bitcoin::hash_types::Txid"|"bitcoin::hash_types::BlockHash"|"bitcoin_hashes::sha256::Hash"
 				if !is_ref => Some(".into_inner() }"),
 			"bitcoin::secp256k1::Message" if !is_ref => Some(".as_ref().clone() }"),
-			"lightning::ln::channelmanager::PaymentHash" if is_ref => Some(".0"),
-			"lightning::ln::channelmanager::PaymentHash" => Some(".0 }"),
-			"lightning::ln::channelmanager::PaymentPreimage" if is_ref => Some(".0"),
-			"lightning::ln::channelmanager::PaymentPreimage" => Some(".0 }"),
-			"lightning::ln::channelmanager::PaymentSecret" if !is_ref => Some(".0 }"),
+			"lightning::ln::PaymentHash" if is_ref => Some(".0"),
+			"lightning::ln::PaymentHash" => Some(".0 }"),
+			"lightning::ln::PaymentPreimage" if is_ref => Some(".0"),
+			"lightning::ln::PaymentPreimage" => Some(".0 }"),
+			"lightning::ln::PaymentSecret" if !is_ref => Some(".0 }"),
 
 			// Override the default since Records contain an fmt with a lifetime:
 			"lightning::util::logger::Record" => Some(".as_ptr()"),
@@ -1136,7 +1140,7 @@ 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::channelmanager::PaymentSecret" => Some(".data == [0; 32]"),
+			"lightning::ln::PaymentSecret" => Some(".data == [0; 32]"),
 			"secp256k1::key::PublicKey"|"bitcoin::secp256k1::key::PublicKey" => Some(".is_null()"),
 			"bitcoin::secp256k1::Signature" => Some(".is_null()"),
 			_ => None