mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-12-24 23:19:34 -05:00
Merge pull request #23 from comit-network/remove-re-export
Do not re-export curve25519_dalek
This commit is contained in:
commit
58aa2b5a2b
@ -81,7 +81,7 @@ 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::{cross_curve_dleq, curve25519_dalek, serde::monero_private_key};
|
use xmr_btc::{cross_curve_dleq, monero, serde::monero_private_key};
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, PartialEq)]
|
#[derive(Debug, Serialize, Deserialize, PartialEq)]
|
||||||
pub struct TestState {
|
pub struct TestState {
|
||||||
@ -109,8 +109,7 @@ mod tests {
|
|||||||
|
|
||||||
let a = xmr_btc::bitcoin::SecretKey::new_random(&mut OsRng);
|
let a = xmr_btc::bitcoin::SecretKey::new_random(&mut OsRng);
|
||||||
let s_a = cross_curve_dleq::Scalar::random(&mut OsRng);
|
let s_a = cross_curve_dleq::Scalar::random(&mut OsRng);
|
||||||
let s_b =
|
let s_b = monero::PrivateKey::from_scalar(monero::Scalar::random(&mut OsRng));
|
||||||
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(),
|
||||||
|
@ -53,4 +53,3 @@ pub mod serde;
|
|||||||
pub mod transport;
|
pub mod transport;
|
||||||
|
|
||||||
pub use cross_curve_dleq;
|
pub use cross_curve_dleq;
|
||||||
pub use curve25519_dalek;
|
|
||||||
|
@ -70,7 +70,6 @@ pub mod monero_amount {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use curve25519_dalek::scalar::Scalar;
|
|
||||||
use rand::rngs::OsRng;
|
use rand::rngs::OsRng;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
@ -82,7 +81,9 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn serde_monero_private_key() {
|
fn serde_monero_private_key() {
|
||||||
let key = MoneroPrivateKey(monero::PrivateKey::from_scalar(Scalar::random(&mut OsRng)));
|
let key = MoneroPrivateKey(monero::PrivateKey::from_scalar(
|
||||||
|
crate::monero::Scalar::random(&mut OsRng),
|
||||||
|
));
|
||||||
let encoded = serde_cbor::to_vec(&key).unwrap();
|
let encoded = serde_cbor::to_vec(&key).unwrap();
|
||||||
let decoded: MoneroPrivateKey = serde_cbor::from_slice(&encoded).unwrap();
|
let decoded: MoneroPrivateKey = serde_cbor::from_slice(&encoded).unwrap();
|
||||||
assert_eq!(key, decoded);
|
assert_eq!(key, decoded);
|
||||||
|
Loading…
Reference in New Issue
Block a user