Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-01 01:45:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify constructor of Bob's EventLoop

Browse Source 
We never customize the behaviour or transport. Might as well hide
those details in the implementation.
This commit is contained in:
Thomas Eizinger 2021-03-03 13:05:18 +11:00
parent 1b167f3eb6
commit 089ac0806e
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swap/src/protocol/bob.rs
View File

@ -5,10 +5,7 @@ use crate::{
database::Database, database::Database,
execution_params::ExecutionParams, execution_params::ExecutionParams,
monero, network, monero, network,
network::{ network::peer_tracker::{self, PeerTracker},
peer_tracker::{self, PeerTracker},
transport::build,
},
protocol::{alice, alice::TransferProof, bob}, protocol::{alice, alice::TransferProof, bob},
seed::Seed, seed::Seed,
}; };
@ -53,7 +50,6 @@ pub struct Swap {
pub struct Builder { pub struct Builder {
swap_id: Uuid, swap_id: Uuid,
identity: Keypair, identity: Keypair,
peer_id: PeerId,
db: Database, db: Database,
alice_address: Multiaddr, alice_address: Multiaddr,
@ -84,12 +80,10 @@ impl Builder {
execution_params: ExecutionParams, execution_params: ExecutionParams,
) -> Self { ) -> Self {
let identity = network::Seed::new(seed).derive_libp2p_identity(); let identity = network::Seed::new(seed).derive_libp2p_identity();
let peer_id = identity.public().into_peer_id();
Self { Self {
swap_id, swap_id,
identity, identity,
peer_id,
db, db,
alice_address, alice_address,
alice_peer_id, alice_peer_id,
@ -152,13 +146,8 @@ impl Builder {
fn init_event_loop( fn init_event_loop(
&self, &self,
) -> Result<(bob::event_loop::EventLoop, bob::event_loop::EventLoopHandle)> { ) -> Result<(bob::event_loop::EventLoop, bob::event_loop::EventLoopHandle)> {
let bob_behaviour = bob::Behaviour::default();
let bob_transport = build(&self.identity)?;
bob::event_loop::EventLoop::new( bob::event_loop::EventLoop::new(
bob_transport, &self.identity,
bob_behaviour,
self.peer_id,
self.alice_peer_id, self.alice_peer_id,
self.alice_address.clone(), self.alice_address.clone(),
self.bitcoin_wallet.clone(), self.bitcoin_wallet.clone(),

23
swap/src/protocol/bob/event_loop.rs
View File

@ -1,7 +1,7 @@
use crate::{ use crate::{
bitcoin, bitcoin,
bitcoin::EncryptedSignature, bitcoin::EncryptedSignature,
network::{transport::SwapTransport, TokioExecutor}, network::{transport, TokioExecutor},
protocol::{ protocol::{
alice::{QuoteResponse, TransferProof}, alice::{QuoteResponse, TransferProof},
bob::{Behaviour, OutEvent, QuoteRequest, State0, State2}, bob::{Behaviour, OutEvent, QuoteRequest, State0, State2},
@ -114,18 +114,23 @@ pub struct EventLoop {
impl EventLoop { impl EventLoop {
pub fn new( pub fn new(
transport: SwapTransport, identity: &libp2p::core::identity::Keypair,
behaviour: Behaviour,
peer_id: PeerId,
alice_peer_id: PeerId, alice_peer_id: PeerId,
alice_addr: Multiaddr, alice_addr: Multiaddr,
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
) -> Result<(Self, EventLoopHandle)> { ) -> Result<(Self, EventLoopHandle)> {
let mut swarm = libp2p::swarm::SwarmBuilder::new(transport, behaviour, peer_id) let behaviour = Behaviour::default();
.executor(Box::new(TokioExecutor { let transport = transport::build(identity)?;
handle: tokio::runtime::Handle::current(),
})) let mut swarm = libp2p::swarm::SwarmBuilder::new(
.build(); transport,
behaviour,
identity.public().into_peer_id(),
)
.executor(Box::new(TokioExecutor {
handle: tokio::runtime::Handle::current(),
}))
.build();
swarm.add_address(alice_peer_id, alice_addr); swarm.add_address(alice_peer_id, alice_addr);