Bump workspace to rust edition 2018

Mostly motivated by the need of async/await.

Author: wpaulino

fuzz/Cargo.toml

@@ -3,6 +3,7 @@ name = "lightning-fuzz"
 version = "0.0.1"
 authors = ["Automatically generated"]
 publish = false
+edition = "2018"
 # Because the function is unused it gets dropped before we link lightning, so
 # we have to duplicate build.rs here. Note that this is only required for
 # fuzzing mode.

lightning-invoice/Cargo.toml

@@ -8,6 +8,7 @@ license = "MIT OR Apache-2.0"
 keywords = [ "lightning", "bitcoin", "invoice", "BOLT11" ]
 readme = "README.md"
 repository = "https://github.com/lightningdevkit/rust-lightning/"
+edition = "2018"
 
 [package.metadata.docs.rs]
 all-features = true

lightning-invoice/fuzz/Cargo.toml

@@ -3,6 +3,7 @@ name = "lightning-invoice-fuzz"
 version = "0.0.1"
 authors = ["Automatically generated"]
 publish = false
+edition = "2018"
 
 [package.metadata]
 cargo-fuzz = true

lightning-invoice/src/de.rs

@@ -197,7 +197,7 @@ impl FromStr for SiPrefix {
 	type Err = ParseError;
 
 	fn from_str(currency_prefix: &str) -> Result<Self, ParseError> {
-		use SiPrefix::*;
+		use crate::SiPrefix::*;
 		match currency_prefix {
 			"m" => Ok(Milli),
 			"u" => Ok(Micro),
@@ -715,15 +715,15 @@ impl From<ParseError> for ParseOrSemanticError {
 	}
 }
 
-impl From<::SemanticError> for ParseOrSemanticError {
+impl From<crate::SemanticError> for ParseOrSemanticError {
 	fn from(e: SemanticError) -> Self {
 		ParseOrSemanticError::SemanticError(e)
 	}
 }
 
 #[cfg(test)]
 mod test {
-	use de::ParseError;
+	use crate::de::ParseError;
 	use secp256k1::PublicKey;
 	use bech32::u5;
 	use bitcoin_hashes::hex::FromHex;
@@ -749,7 +749,7 @@ mod test {
 
 	#[test]
 	fn test_parse_currency_prefix() {
-		use Currency;
+		use crate::Currency;
 
 		assert_eq!("bc".parse::<Currency>(), Ok(Currency::Bitcoin));
 		assert_eq!("tb".parse::<Currency>(), Ok(Currency::BitcoinTestnet));
@@ -761,7 +761,7 @@ mod test {
 
 	#[test]
 	fn test_parse_int_from_bytes_be() {
-		use de::parse_int_be;
+		use crate::de::parse_int_be;
 
 		assert_eq!(parse_int_be::<u32, u8>(&[1, 2, 3, 4], 256), Some(16909060));
 		assert_eq!(parse_int_be::<u32, u8>(&[1, 3], 32), Some(35));
@@ -771,7 +771,7 @@ mod test {
 
 	#[test]
 	fn test_parse_sha256_hash() {
-		use Sha256;
+		use crate::Sha256;
 		use bech32::FromBase32;
 
 		let input = from_bech32(
@@ -794,7 +794,7 @@ mod test {
 
 	#[test]
 	fn test_parse_description() {
-		use ::Description;
+		use crate::Description;
 		use bech32::FromBase32;
 
 		let input = from_bech32("xysxxatsyp3k7enxv4js".as_bytes());
@@ -804,7 +804,7 @@ mod test {
 
 	#[test]
 	fn test_parse_payee_pub_key() {
-		use ::PayeePubKey;
+		use crate::PayeePubKey;
 		use bech32::FromBase32;
 
 		let input = from_bech32("q0n326hr8v9zprg8gsvezcch06gfaqqhde2aj730yg0durunfhv66".as_bytes());
@@ -828,7 +828,7 @@ mod test {
 
 	#[test]
 	fn test_parse_expiry_time() {
-		use ::ExpiryTime;
+		use crate::ExpiryTime;
 		use bech32::FromBase32;
 
 		let input = from_bech32("pu".as_bytes());
@@ -841,7 +841,7 @@ mod test {
 
 	#[test]
 	fn test_parse_min_final_cltv_expiry() {
-		use ::MinFinalCltvExpiry;
+		use crate::MinFinalCltvExpiry;
 		use bech32::FromBase32;
 
 		let input = from_bech32("pr".as_bytes());
@@ -852,7 +852,7 @@ mod test {
 
 	#[test]
 	fn test_parse_fallback() {
-		use Fallback;
+		use crate::Fallback;
 		use bech32::FromBase32;
 
 		let cases = vec![
@@ -911,9 +911,9 @@ mod test {
 	fn test_parse_route() {
 		use lightning::routing::gossip::RoutingFees;
 		use lightning::routing::router::{RouteHint, RouteHintHop};
-		use ::PrivateRoute;
+		use crate::PrivateRoute;
 		use bech32::FromBase32;
-		use de::parse_int_be;
+		use crate::de::parse_int_be;
 
 		let input = from_bech32(
 			"q20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqpqqqqq9qqqvpeuqa\
@@ -968,8 +968,8 @@ mod test {
 	fn test_payment_secret_and_features_de_and_ser() {
 		use lightning::ln::features::InvoiceFeatures;
 		use secp256k1::ecdsa::{RecoveryId, RecoverableSignature};
-		use TaggedField::*;
-		use {SiPrefix, SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart,
+		use crate::TaggedField::*;
+		use crate::{SiPrefix, SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart,
 				 Currency, Sha256, PositiveTimestamp};
 
 		// Feature bits 9, 15, and 99 are set.
@@ -988,8 +988,8 @@ mod test {
 								PaymentHash(Sha256(sha256::Hash::from_hex(
 									"0001020304050607080900010203040506070809000102030405060708090102"
 								).unwrap())).into(),
-								Description(::Description::new("coffee beans".to_owned()).unwrap()).into(),
-								PaymentSecret(::PaymentSecret([17; 32])).into(),
+								Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
+								PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 								Features(expected_features).into()]}
 								},
 					hash: [0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
@@ -1013,9 +1013,9 @@ mod test {
 
 	#[test]
 	fn test_raw_signed_invoice_deserialization() {
-		use TaggedField::*;
+		use crate::TaggedField::*;
 		use secp256k1::ecdsa::{RecoveryId, RecoverableSignature};
-		use {SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
+		use crate::{SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
 			 PositiveTimestamp};
 
 		assert_eq!(
@@ -1036,7 +1036,7 @@ mod test {
 							"0001020304050607080900010203040506070809000102030405060708090102"
 						).unwrap())).into(),
 						Description(
-							::Description::new(
+							crate::Description::new(
 								"Please consider supporting this project".to_owned()
 							).unwrap()
 						).into(),

lightning-invoice/src/lib.rs

@@ -86,7 +86,7 @@ mod prelude {
 	pub use alloc::string::ToString;
 }
 
-use prelude::*;
+use crate::prelude::*;
 
 /// Sync compat for std/no_std
 #[cfg(feature = "std")]
@@ -135,7 +135,7 @@ pub enum ParseOrSemanticError {
 	ParseError(ParseError),
 
 	/// The invoice could be decoded but violates the BOLT11 standard
-	SemanticError(::SemanticError),
+	SemanticError(crate::SemanticError),
 }
 
 /// The number of bits used to represent timestamps as defined in BOLT 11.
@@ -360,7 +360,7 @@ impl SiPrefix {
 	/// (C-not exported) As we don't yet support a slice of enums, and also because this function
 	/// isn't the most critical to expose.
 	pub fn values_desc() -> &'static [SiPrefix] {
-		use SiPrefix::*;
+		use crate::SiPrefix::*;
 		static VALUES: [SiPrefix; 4] = [Milli, Micro, Nano, Pico];
 		&VALUES
 	}
@@ -1562,15 +1562,15 @@ mod test {
 	#[test]
 	fn test_system_time_bounds_assumptions() {
 		assert_eq!(
-			::PositiveTimestamp::from_unix_timestamp(::MAX_TIMESTAMP + 1),
-			Err(::CreationError::TimestampOutOfBounds)
+			crate::PositiveTimestamp::from_unix_timestamp(crate::MAX_TIMESTAMP + 1),
+			Err(crate::CreationError::TimestampOutOfBounds)
 		);
 	}
 
 	#[test]
 	fn test_calc_invoice_hash() {
-		use ::{RawInvoice, RawHrp, RawDataPart, Currency, PositiveTimestamp};
-		use ::TaggedField::*;
+		use crate::{RawInvoice, RawHrp, RawDataPart, Currency, PositiveTimestamp};
+		use crate::TaggedField::*;
 
 		let invoice = RawInvoice {
 			hrp: RawHrp {
@@ -1581,10 +1581,10 @@ mod test {
 			data: RawDataPart {
 				timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 				tagged_fields: vec![
-					PaymentHash(::Sha256(sha256::Hash::from_hex(
+					PaymentHash(crate::Sha256(sha256::Hash::from_hex(
 						"0001020304050607080900010203040506070809000102030405060708090102"
 					).unwrap())).into(),
-					Description(::Description::new(
+					Description(crate::Description::new(
 						"Please consider supporting this project".to_owned()
 					).unwrap()).into(),
 				],
@@ -1602,11 +1602,11 @@ mod test {
 
 	#[test]
 	fn test_check_signature() {
-		use TaggedField::*;
+		use crate::TaggedField::*;
 		use secp256k1::Secp256k1;
 		use secp256k1::ecdsa::{RecoveryId, RecoverableSignature};
 		use secp256k1::{SecretKey, PublicKey};
-		use {SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
+		use crate::{SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
 			 PositiveTimestamp};
 
 		let invoice = SignedRawInvoice {
@@ -1623,7 +1623,7 @@ mod test {
 							"0001020304050607080900010203040506070809000102030405060708090102"
 						).unwrap())).into(),
 						Description(
-							::Description::new(
+							crate::Description::new(
 								"Please consider supporting this project".to_owned()
 							).unwrap()
 						).into(),
@@ -1659,7 +1659,7 @@ mod test {
 		).unwrap();
 		let public_key = PublicKey::from_secret_key(&Secp256k1::new(), &private_key);
 
-		assert_eq!(invoice.recover_payee_pub_key(), Ok(::PayeePubKey(public_key)));
+		assert_eq!(invoice.recover_payee_pub_key(), Ok(crate::PayeePubKey(public_key)));
 
 		let (raw_invoice, _, _) = invoice.into_parts();
 		let new_signed = raw_invoice.sign::<_, ()>(|hash| {
@@ -1671,11 +1671,11 @@ mod test {
 
 	#[test]
 	fn test_check_feature_bits() {
-		use TaggedField::*;
+		use crate::TaggedField::*;
 		use lightning::ln::features::InvoiceFeatures;
 		use secp256k1::Secp256k1;
 		use secp256k1::SecretKey;
-		use {RawInvoice, RawHrp, RawDataPart, Currency, Sha256, PositiveTimestamp, Invoice,
+		use crate::{RawInvoice, RawHrp, RawDataPart, Currency, Sha256, PositiveTimestamp, Invoice,
 			 SemanticError};
 
 		let private_key = SecretKey::from_slice(&[42; 32]).unwrap();
@@ -1693,7 +1693,7 @@ mod test {
 						"0001020304050607080900010203040506070809000102030405060708090102"
 					).unwrap())).into(),
 					Description(
-						::Description::new(
+						crate::Description::new(
 							"Please consider supporting this project".to_owned()
 						).unwrap()
 					).into(),
@@ -1765,7 +1765,7 @@ mod test {
 
 	#[test]
 	fn test_builder_amount() {
-		use ::*;
+		use crate::*;
 
 		let builder = InvoiceBuilder::new(Currency::Bitcoin)
 			.description("Test".into())
@@ -1792,7 +1792,7 @@ mod test {
 
 	#[test]
 	fn test_builder_fail() {
-		use ::*;
+		use crate::*;
 		use lightning::routing::router::RouteHintHop;
 		use std::iter::FromIterator;
 		use secp256k1::PublicKey;
@@ -1846,7 +1846,7 @@ mod test {
 
 	#[test]
 	fn test_builder_ok() {
-		use ::*;
+		use crate::*;
 		use lightning::routing::router::RouteHintHop;
 		use secp256k1::Secp256k1;
 		use secp256k1::{SecretKey, PublicKey};
@@ -1966,7 +1966,7 @@ mod test {
 
 	#[test]
 	fn test_default_values() {
-		use ::*;
+		use crate::*;
 		use secp256k1::Secp256k1;
 		use secp256k1::SecretKey;
 
@@ -1992,7 +1992,7 @@ mod test {
 
 	#[test]
 	fn test_expiration() {
-		use ::*;
+		use crate::*;
 		use secp256k1::Secp256k1;
 		use secp256k1::SecretKey;
 

lightning-invoice/src/payment.rs

@@ -150,7 +150,7 @@ use lightning::util::errors::APIError;
 use lightning::util::events::{Event, EventHandler};
 use lightning::util::logger::Logger;
 use lightning::util::ser::Writeable;
-use time_utils::Time;
+use crate::time_utils::Time;
 use crate::sync::Mutex;
 
 use secp256k1::PublicKey;
@@ -762,7 +762,7 @@ impl lightning::util::ser::Readable for InFlightHtlcs {
 mod tests {
 	use super::*;
 	use crate::{InvoiceBuilder, Currency};
-	use utils::{ScorerAccountingForInFlightHtlcs, create_invoice_from_channelmanager_and_duration_since_epoch};
+	use crate::utils::{ScorerAccountingForInFlightHtlcs, create_invoice_from_channelmanager_and_duration_since_epoch};
 	use bitcoin_hashes::sha256::Hash as Sha256;
 	use lightning::ln::PaymentPreimage;
 	use lightning::ln::channelmanager;
@@ -780,8 +780,8 @@ mod tests {
 	use std::collections::VecDeque;
 	use std::ops::DerefMut;
 	use std::time::{SystemTime, Duration};
-	use time_utils::tests::SinceEpoch;
-	use DEFAULT_EXPIRY_TIME;
+	use crate::time_utils::tests::SinceEpoch;
+	use crate::DEFAULT_EXPIRY_TIME;
 	use lightning::util::errors::APIError::{ChannelUnavailable, MonitorUpdateInProgress};
 
 	fn invoice(payment_preimage: PaymentPreimage) -> Invoice {