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

Revert re-imports to qualified paths

Browse Source
This commit is contained in:
rishflab 2020-10-26 11:45:27 +11:00
parent fea6b29da9
commit ec71f98252
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swap/src/storage.rs
View File

@ -81,14 +81,13 @@ mod tests {
use rand::rngs::OsRng; use rand::rngs::OsRng;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::str::FromStr; use std::str::FromStr;
use xmr_btc::serde::monero_private_key; use xmr_btc::{cross_curve_dleq, curve25519_dalek, serde::monero_private_key};
use xmr_btc::{CrossCurveScalar, Curve25519Scalar};
#[derive(Debug, Serialize, Deserialize, PartialEq)] #[derive(Debug, Serialize, Deserialize, PartialEq)]
pub struct TestState { pub struct TestState {
A: xmr_btc::bitcoin::PublicKey, A: xmr_btc::bitcoin::PublicKey,
a: xmr_btc::bitcoin::SecretKey, a: xmr_btc::bitcoin::SecretKey,
s_a: CrossCurveScalar, s_a: cross_curve_dleq::Scalar,
#[serde(with = "monero_private_key")] #[serde(with = "monero_private_key")]
s_b: monero::PrivateKey, s_b: monero::PrivateKey,
S_a_monero: ::monero::PublicKey, S_a_monero: ::monero::PublicKey,
@ -109,8 +108,9 @@ mod tests {
let db = Database::open(db_dir.path()).unwrap(); let db = Database::open(db_dir.path()).unwrap();
let a = xmr_btc::bitcoin::SecretKey::new_random(&mut OsRng); let a = xmr_btc::bitcoin::SecretKey::new_random(&mut OsRng);
let s_a = CrossCurveScalar::random(&mut OsRng); let s_a = cross_curve_dleq::Scalar::random(&mut OsRng);
let s_b = monero::PrivateKey::from_scalar(Curve25519Scalar::random(&mut OsRng)); let s_b =
monero::PrivateKey::from_scalar(curve25519_dalek::scalar::Scalar::random(&mut OsRng));
let v_a = xmr_btc::monero::PrivateViewKey::new_random(&mut OsRng); let v_a = xmr_btc::monero::PrivateViewKey::new_random(&mut OsRng);
let S_a_monero = monero::PublicKey::from_private_key(&monero::PrivateKey { let S_a_monero = monero::PublicKey::from_private_key(&monero::PrivateKey {
scalar: s_a.into_ed25519(), scalar: s_a.into_ed25519(),

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

@ -52,8 +52,8 @@ pub mod monero;
pub mod serde; pub mod serde;
pub mod transport; pub mod transport;
pub use cross_curve_dleq::Scalar as CrossCurveScalar; pub use cross_curve_dleq;
pub use curve25519_dalek::scalar::Scalar as Curve25519Scalar; pub use curve25519_dalek;
use async_trait::async_trait; use async_trait::async_trait;
use ecdsa_fun::{adaptor::Adaptor, nonce::Deterministic}; use ecdsa_fun::{adaptor::Adaptor, nonce::Deterministic};