Run chanmon_consistency_test with anchor outputs channels

[rust-lightning] / lightning-invoice / src / lib.rs

diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
index d4e2b736757d35c62f348fccf122f3cd39403470..d953795cf8e061157f1c69e9c5bc5eae2b743ca6 100644 (file)
--- a/lightning-invoice/src/lib.rs
+++ b/lightning-invoice/src/lib.rs
@@ -30,8 +30,6 @@ compile_error!("at least one of the `std` or `no-std` features must be enabled")
 pub mod payment;
 pub mod utils;
 
-pub(crate) mod time_utils;
-
 extern crate bech32;
 extern crate bitcoin_hashes;
 #[macro_use] extern crate lightning;
@@ -51,8 +49,6 @@ use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
 use bitcoin::util::address::{Payload, WitnessVersion};
 use bitcoin_hashes::{Hash, sha256};
 use lightning::ln::features::Bolt11InvoiceFeatures;
-#[cfg(any(doc, test))]
-use lightning::routing::gossip::RoutingFees;
 use lightning::util::invoice::construct_invoice_preimage;
 
 use secp256k1::PublicKey;
@@ -74,7 +70,9 @@ use serde::{Deserialize, Deserializer,Serialize, Serializer, de::Error};
 #[doc(no_inline)]
 pub use lightning::ln::PaymentSecret;
 #[doc(no_inline)]
-pub use lightning::routing::router::RouteHint;
+pub use lightning::routing::router::{RouteHint, RouteHintHop};
+#[doc(no_inline)]
+pub use lightning::routing::gossip::RoutingFees;
 
 mod de;
 mod ser;
@@ -506,7 +504,7 @@ pub struct Bolt11InvoiceSignature(pub RecoverableSignature);
 
 impl PartialOrd for Bolt11InvoiceSignature {
        fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-               self.0.serialize_compact().1.partial_cmp(&other.0.serialize_compact().1)
+               Some(self.cmp(other))
        }
 }