Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-08 14:32:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Create network::Seed from swap::Seed instead of abstracting over byte array

Browse source
This commit is contained in:
Daniel Karzel 2021-01-08 14:52:29 +11:00
parent f18d01dfaf
commit 664958939d
9 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
swap/src/main.rs
View file

@ -114,7 +114,7 @@ async fn main() -> Result<()> {
monero_wallet,
config,
db,
&seed,
seed,
)
.await?;
}
@ -167,7 +167,7 @@ async fn main() -> Result<()> {
db,
alice_peer_id,
alice_addr,
&seed,
seed,
)
.await?;
}
@ -211,7 +211,7 @@ async fn main() -> Result<()> {
monero_wallet,
config,
db,
&seed,
seed,
)
.await?;
}
@ -244,7 +244,7 @@ async fn main() -> Result<()> {
db,
alice_peer_id,
alice_addr,
&seed,
seed,
)
.await?;
}
@ -288,9 +288,9 @@ async fn alice_swap(
monero_wallet: Arc<swap::monero::Wallet>,
config: Config,
db: Database,
seed: &Seed,
seed: Seed,
) -> Result<AliceState> {
let alice_behaviour = alice::Behaviour::new(network::Seed::new(seed.bytes()));
let alice_behaviour = alice::Behaviour::new(network::Seed::new(seed));
let alice_peer_id = alice_behaviour.peer_id();
info!("Own Peer-ID: {}", alice_peer_id);
let alice_transport = build(alice_behaviour.identity())?;
@ -321,9 +321,9 @@ async fn bob_swap(
db: Database,
alice_peer_id: PeerId,
alice_addr: Multiaddr,
seed: &Seed,
seed: Seed,
) -> Result<BobState> {
let bob_behaviour = bob::Behaviour::new(network::Seed::new(seed.bytes()));
let bob_behaviour = bob::Behaviour::new(network::Seed::new(seed));
let bob_transport = build(bob_behaviour.identity())?;
let (event_loop, handle) =

6
swap/src/network.rs
View file

@ -25,17 +25,17 @@ pub struct Seed([u8; SEED_LENGTH]);
impl Seed {
/// prefix "NETWORK" to the provided seed and apply sha256
pub fn new(seed: [u8; crate::seed::SEED_LENGTH]) -> Self {
pub fn new(seed: crate::seed::Seed) -> Self {
let mut engine = sha256::HashEngine::default();
engine.input(&seed);
engine.input(&seed.bytes());
engine.input(b"NETWORK");
let hash = sha256::Hash::from_engine(engine);
Self(hash.into_inner())
}
pub fn bytes(&self) -> [u8; SEED_LENGTH] {
fn bytes(&self) -> [u8; SEED_LENGTH] {
self.0
}