diff --git a/monero-adaptor/tests/integration_test.rs b/monero-adaptor/tests/integration_test.rs index d7c8b67a..b2997815 100644 --- a/monero-adaptor/tests/integration_test.rs +++ b/monero-adaptor/tests/integration_test.rs @@ -16,7 +16,7 @@ use monero_harness::Monero; use monero_rpc::monerod::{GetOutputsOut, MonerodRpc}; use monero_wallet::MonerodClientExt; use rand::rngs::OsRng; -use rand::{thread_rng, CryptoRng, Rng, SeedableRng}; +use rand::{CryptoRng, Rng, SeedableRng}; use std::convert::TryInto; use std::iter; use testcontainers::clients::Cli; @@ -147,10 +147,11 @@ async fn monerod_integration_test() { let ecdh_key_1 = PrivateKey::random(&mut rng); let (ecdh_info_1, out_blinding_1) = EcdhInfo::new_bulletproof(spend_amount, ecdh_key_1.scalar); - let (bulletproof, out_pk) = monero::make_bulletproof(&mut rng, &[spend_amount, 0], &[ - out_blinding_0, - out_blinding_1, - ]) + let (bulletproof, out_pk) = monero::make_bulletproof( + &mut rng, + &[spend_amount, 0], + &[out_blinding_0, out_blinding_1], + ) .unwrap(); let k_image = { @@ -373,18 +374,21 @@ mod tests { let relative_offsets = to_relative_offsets(&key_offsets); - assert_eq!(&relative_offsets, &[ - VarInt(78), - VarInt(3), - VarInt(10), - VarInt(0), - VarInt(5), - VarInt(2), - VarInt(3), - VarInt(11), - VarInt(1), - VarInt(1), - VarInt(3), - ]) + assert_eq!( + &relative_offsets, + &[ + VarInt(78), + VarInt(3), + VarInt(10), + VarInt(0), + VarInt(5), + VarInt(2), + VarInt(3), + VarInt(11), + VarInt(1), + VarInt(1), + VarInt(3), + ] + ) } } diff --git a/monero-wallet/src/lib.rs b/monero-wallet/src/lib.rs index ce534736..aafd8691 100644 --- a/monero-wallet/src/lib.rs +++ b/monero-wallet/src/lib.rs @@ -81,12 +81,12 @@ mod tests { let container = cli.run(Monerod::default()); let rpc_client = Client::localhost(container.get_host_port(18081).unwrap()).unwrap(); rpc_client.generateblocks(150, "498AVruCDWgP9Az9LjMm89VWjrBrSZ2W2K3HFBiyzzrRjUJWUcCVxvY1iitfuKoek2FdX6MKGAD9Qb1G1P8QgR5jPmmt3Vj".to_owned()).await.unwrap(); - let wallet = Wallet { - client: rpc_client.clone(), - key: todo!(), - }; - - let (lower, upper) = wallet.calculate_key_offset_boundaries().await.unwrap(); + // let wallet = Wallet { + // client: rpc_client.clone(), + // key: todo!(), + // }; + // + // let (lower, upper) = wallet.calculate_key_offset_boundaries().await.unwrap(); todo!("fix"); // let result = rpc_client