Rebase on c35600e

p2pderivatives · Mar 22, 2023 · 182442b · 182442b
1 parent 4d3a21e
commit 182442b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/dlc-manager/src/manager.rs b/dlc-manager/src/manager.rs
@@ -2363,11 +2363,11 @@ where
 
 #[cfg(test)]
 mod test {
-    use dlc_messages::Message;
+    use dlc_messages::{ChannelMessage, Message, OnChainMessage};
     use mocks::{
         dlc_manager::{manager::Manager, Oracle},
         memory_storage_provider::MemoryStorage,
-        mock_blockchain::MockBlockchain,
+        mock_blockchain::{MockBlockchain, MockBroadcaster},
         mock_oracle_provider::MockOracle,
         mock_time::MockTime,
         mock_wallet::MockWallet,
@@ -2377,15 +2377,15 @@ mod test {
 
     type TestManager = Manager<
         Rc<MockWallet>,
-        Rc<MockBlockchain>,
+        Rc<MockBlockchain<Rc<MockBroadcaster>>>,
         Rc<MemoryStorage>,
         Rc<MockOracle>,
         Rc<MockTime>,
-        Rc<MockBlockchain>,
+        Rc<MockBlockchain<Rc<MockBroadcaster>>>,
     >;
 
     fn get_manager() -> TestManager {
-        let blockchain = Rc::new(MockBlockchain {});
+        let blockchain = Rc::new(MockBlockchain::new(Rc::new(MockBroadcaster {})));
         let store = Rc::new(MemoryStorage::new());
         let wallet = Rc::new(MockWallet::new(&blockchain, 100));
 
@@ -2417,11 +2417,11 @@ mod test {
 
     #[test]
     fn reject_offer_with_existing_contract_id() {
-        let offer_message = Message::Offer(
+        let offer_message = Message::OnChain(OnChainMessage::Offer(
             serde_json::from_str(include_str!("../test_inputs/offer_contract.json")).unwrap(),
-        );
+        ));
 
-        let mut manager = get_manager();
+        let manager = get_manager();
 
         manager
             .on_dlc_message(&offer_message, pubkey())
@@ -2434,11 +2434,11 @@ mod test {
 
     #[test]
     fn reject_channel_offer_with_existing_channel_id() {
-        let offer_message = Message::OfferChannel(
+        let offer_message = Message::Channel(ChannelMessage::Offer(
             serde_json::from_str(include_str!("../test_inputs/offer_channel.json")).unwrap(),
-        );
+        ));
 
-        let mut manager = get_manager();
+        let manager = get_manager();
 
         manager
             .on_dlc_message(&offer_message, pubkey())

diff --git a/mocks/src/mock_wallet.rs b/mocks/src/mock_wallet.rs
@@ -1,7 +1,8 @@
-use std::rc::Rc;
+use std::{ops::Deref, rc::Rc};
 
 use bitcoin::{Address, PackedLockTime, Script, Transaction, TxOut};
 use dlc_manager::{error::Error, Blockchain, Signer, Utxo, Wallet};
+use lightning::chain::chaininterface::BroadcasterInterface;
 use secp256k1_zkp::{rand::seq::SliceRandom, SecretKey};
 
 use crate::mock_blockchain::MockBlockchain;
@@ -11,7 +12,10 @@ pub struct MockWallet {
 }
 
 impl MockWallet {
-    pub fn new(blockchain: &Rc<MockBlockchain>, nb_utxo: u16) -> Self {
+    pub fn new<T: Deref>(blockchain: &Rc<MockBlockchain<T>>, nb_utxo: u16) -> Self
+    where
+        T::Target: BroadcasterInterface,
+    {
         let mut utxos = Vec::with_capacity(nb_utxo as usize);
 
         for i in 0..nb_utxo {