Use inline bounds for secp contexts, rather than `where` clauses

The bindings really should support this, but currently they don't
and its late enough in the release cycle I don't want to try to fix
that.

diff --git a/lightning/src/blinded_path/message.rs b/lightning/src/blinded_path/message.rs
index 0651877750c732591ec994e79c08def1acdb365e..e4aed2a547cce447b638cc1486b2f4b355a56994 100644 (file)
--- a/lightning/src/blinded_path/message.rs
+++ b/lightning/src/blinded_path/message.rs
@@ -142,13 +142,12 @@ impl BlindedMessagePath {
        /// introduction node.
        ///
        /// Will only modify `self` when returning `Ok`.
-       pub fn advance_path_by_one<NS: Deref, NL: Deref, T>(
+       pub fn advance_path_by_one<NS: Deref, NL: Deref, T: secp256k1::Signing + secp256k1::Verification>(
                &mut self, node_signer: &NS, node_id_lookup: &NL, secp_ctx: &Secp256k1<T>
        ) -> Result<(), ()>
        where
                NS::Target: NodeSigner,
                NL::Target: NodeIdLookUp,
-               T: secp256k1::Signing + secp256k1::Verification,
        {
                let control_tlvs_ss = node_signer.ecdh(Recipient::Node, &self.0.blinding_point, None)?;
                let rho = onion_utils::gen_rho_from_shared_secret(&control_tlvs_ss.secret_bytes());

diff --git a/lightning/src/blinded_path/payment.rs b/lightning/src/blinded_path/payment.rs
index 320547962ce9ed98d87146bad62955e1cbd007ad..c84e5926a92299b3c8aa5b77719a169406b86ce5 100644 (file)
--- a/lightning/src/blinded_path/payment.rs
+++ b/lightning/src/blinded_path/payment.rs
@@ -157,13 +157,12 @@ impl BlindedPaymentPath {
        /// introduction node.
        ///
        /// Will only modify `self` when returning `Ok`.
-       pub fn advance_path_by_one<NS: Deref, NL: Deref, T>(
+       pub fn advance_path_by_one<NS: Deref, NL: Deref, T: secp256k1::Signing + secp256k1::Verification>(
                &mut self, node_signer: &NS, node_id_lookup: &NL, secp_ctx: &Secp256k1<T>
        ) -> Result<(), ()>
        where
                NS::Target: NodeSigner,
                NL::Target: NodeIdLookUp,
-               T: secp256k1::Signing + secp256k1::Verification,
        {
                let control_tlvs_ss = node_signer.ecdh(Recipient::Node, &self.inner_path.blinding_point, None)?;
                let rho = onion_utils::gen_rho_from_shared_secret(&control_tlvs_ss.secret_bytes());