Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-01-11 07:29:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove empty lines between imports

Browse Source
This commit is contained in:
rishflab 2020-10-08 11:07:37 +11:00
parent 4e031ff9a2
commit 25edd90fb0
7 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xmr-btc/src/alice.rs
View File

@ -1,7 +1,3 @@
use anyhow::{anyhow, Result};
use ecdsa_fun::adaptor::{Adaptor, EncryptedSignature};
use rand::{CryptoRng, RngCore};
use crate::{
bitcoin,
bitcoin::{BroadcastSignedTransaction, WatchForRawTransaction},
@ -9,7 +5,12 @@ use crate::{
monero::{ImportOutput, Transfer},
transport::SendReceive,
};
use ecdsa_fun::nonce::Deterministic;
use anyhow::{anyhow, Result};
use ecdsa_fun::{
adaptor::{Adaptor, EncryptedSignature},
nonce::Deterministic,
};
use rand::{CryptoRng, RngCore};
use sha2::Sha256;
use std::convert::{TryFrom, TryInto};

6
xmr-btc/src/alice/message.rs
View File

@ -1,10 +1,8 @@
use anyhow::Result;
use ecdsa_fun::adaptor::EncryptedSignature;
use ecdsa_fun::{adaptor::EncryptedSignature, Signature};
use std::convert::TryFrom;
use crate::{bitcoin, monero};
use ecdsa_fun::Signature;
use std::convert::TryFrom;
#[derive(Debug)]
pub enum Message {

4
xmr-btc/src/bitcoin.rs
View File

@ -8,6 +8,7 @@ use bitcoin::{
util::psbt::PartiallySignedTransaction,
SigHash, Transaction,
};
pub use bitcoin::{Address, Amount, OutPoint, Txid};
use ecdsa_fun::{
adaptor::Adaptor,
fun::{
@ -17,14 +18,13 @@ use ecdsa_fun::{
nonce::Deterministic,
ECDSA,
};
pub use ecdsa_fun::{adaptor::EncryptedSignature, Signature};
use miniscript::{Descriptor, Segwitv0};
use rand::{CryptoRng, RngCore};
use sha2::Sha256;
use std::str::FromStr;
pub use crate::bitcoin::transactions::{TxCancel, TxLock, TxPunish, TxRedeem, TxRefund};
pub use bitcoin::{Address, Amount, OutPoint, Txid};
pub use ecdsa_fun::{adaptor::EncryptedSignature, Signature};
pub const TX_FEE: u64 = 10_000;

1
xmr-btc/src/bob/message.rs
View File

@ -1,7 +1,6 @@
use crate::{bitcoin, monero};
use anyhow::Result;
use ecdsa_fun::{adaptor::EncryptedSignature, Signature};
use std::convert::TryFrom;
#[derive(Debug)]

6
xmr-btc/src/monero.rs
View File

@ -1,11 +1,9 @@
use std::ops::Add;
use anyhow::Result;
use async_trait::async_trait;
use rand::{CryptoRng, RngCore};
pub use curve25519_dalek::scalar::Scalar;
pub use monero::{Address, PrivateKey, PublicKey};
use rand::{CryptoRng, RngCore};
use std::ops::Add;
pub fn random_private_key<R: RngCore + CryptoRng>(rng: &mut R) -> PrivateKey {
let scalar = Scalar::random(rng);

2
xmr-btc/tests/e2e.rs
View File

@ -3,10 +3,8 @@ use crate::{
transport::Transport,
};
use bitcoin_harness::Bitcoind;
use monero_harness::Monero;
use rand::rngs::OsRng;
use testcontainers::clients::Cli;
use tokio::sync::{
mpsc,

1
xmr-btc/tests/transport.rs
View File

@ -1,5 +1,4 @@
use anyhow::{anyhow, Result};
use async_trait::async_trait;
use tokio::{
stream::StreamExt,