]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #3263 from TheBlueMatt/2024-08-bindings-om
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 23 Aug 2024 03:04:19 +0000 (03:04 +0000)
committerGitHub <noreply@github.com>
Fri, 23 Aug 2024 03:04:19 +0000 (03:04 +0000)
Remove message type bound on `ResponseInstruction`

1  2 
lightning/src/ln/channelmanager.rs
lightning/src/ln/peer_handler.rs
lightning/src/onion_message/functional_tests.rs
lightning/src/onion_message/messenger.rs

Simple merge
Simple merge
index c1e8cf3a66d01d44e67c4f8f72d2e8fefea6ea26,7d215e365be4cce4413182cb141187724e05c9b2..c569e2dc3aa9da372209860af2c430bcd04c62d7
@@@ -148,10 -148,10 +148,10 @@@ for OnionMessenger<ES, NS, L, NL, MR, O
  /// # use bitcoin::hex::FromHex;
  /// # use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey, self};
  /// # use lightning::blinded_path::EmptyNodeIdLookUp;
 -/// # use lightning::blinded_path::message::{BlindedMessagePath, ForwardNode, MessageContext};
 +/// # use lightning::blinded_path::message::{BlindedMessagePath, MessageForwardNode, MessageContext};
  /// # use lightning::sign::{EntropySource, KeysManager};
  /// # use lightning::ln::peer_handler::IgnoringMessageHandler;
- /// # use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath, OnionMessenger};
+ /// # use lightning::onion_message::messenger::{Destination, MessageRouter, MessageSendInstructions, OnionMessagePath, OnionMessenger};
  /// # use lightning::onion_message::packet::OnionMessageContents;
  /// # use lightning::util::logger::{Logger, Record};
  /// # use lightning::util::ser::{Writeable, Writer};