Take wallet names by reference

We are always passing constants here. Make that more ergonomic.
pull/442/head
Thomas Eizinger 3 years ago
parent 22bdc08c83
commit dc840e1562
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96

@ -56,7 +56,7 @@ impl<'c> Monero {
/// miner wallet container name is: `miner` /// miner wallet container name is: `miner`
pub async fn new( pub async fn new(
cli: &'c Cli, cli: &'c Cli,
additional_wallets: Vec<String>, additional_wallets: Vec<&'static str>,
) -> Result<(Self, Vec<Container<'c, Cli, image::Monero>>)> { ) -> Result<(Self, Vec<Container<'c, Cli, image::Monero>>)> {
let prefix = format!("{}_", random_prefix()); let prefix = format!("{}_", random_prefix());
let monerod_name = format!("{}{}", prefix, MONEROD_DAEMON_CONTAINER_NAME); let monerod_name = format!("{}{}", prefix, MONEROD_DAEMON_CONTAINER_NAME);

@ -17,9 +17,7 @@ async fn fund_transfer_and_check_tx_key() {
let send_to_bob = 5_000_000_000; let send_to_bob = 5_000_000_000;
let tc = Cli::default(); let tc = Cli::default();
let (monero, _containers) = Monero::new(&tc, vec!["alice".to_string(), "bob".to_string()]) let (monero, _containers) = Monero::new(&tc, vec!["alice", "bob"]).await.unwrap();
.await
.unwrap();
let alice_wallet = monero.wallet("alice").unwrap(); let alice_wallet = monero.wallet("alice").unwrap();
let bob_wallet = monero.wallet("bob").unwrap(); let bob_wallet = monero.wallet("bob").unwrap();

@ -195,12 +195,10 @@ async fn init_monero_container(
Monero, Monero,
Vec<Container<'_, Cli, monero_harness::image::Monero>>, Vec<Container<'_, Cli, monero_harness::image::Monero>>,
) { ) {
let (monero, monerods) = Monero::new(&cli, vec![ let (monero, monerods) =
MONERO_WALLET_NAME_ALICE.to_owned(), Monero::new(&cli, vec![MONERO_WALLET_NAME_ALICE, MONERO_WALLET_NAME_BOB])
MONERO_WALLET_NAME_BOB.to_owned(), .await
]) .unwrap();
.await
.unwrap();
(monero, monerods) (monero, monerods)
} }

Loading…
Cancel
Save