From a795bccfe72898109dcdf9e5e1fdab6ae0305c57 Mon Sep 17 00:00:00 2001 From: Lucas Meier Date: Thu, 15 Aug 2024 11:42:19 -0700 Subject: [PATCH] pcli: duplicate positions: use a -n short flag to match auctions --- crates/bin/pcli/src/command/tx.rs | 2 +- crates/bin/pcli/src/command/tx/liquidity_position.rs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/crates/bin/pcli/src/command/tx.rs b/crates/bin/pcli/src/command/tx.rs index 49606e7ea9..90c49d523d 100644 --- a/crates/bin/pcli/src/command/tx.rs +++ b/crates/bin/pcli/src/command/tx.rs @@ -954,7 +954,7 @@ impl TxCmd { tracing::info!(?order); let source = AddressIndex::new(order.source()); - let positions = order.as_position(&asset_cache)?; + let positions = order.as_position(&asset_cache, OsRng)?; tracing::info!(?positions); for position in &positions { println!("Position id: {}", position.id()); diff --git a/crates/bin/pcli/src/command/tx/liquidity_position.rs b/crates/bin/pcli/src/command/tx/liquidity_position.rs index c6a3fcb594..31cf43e210 100644 --- a/crates/bin/pcli/src/command/tx/liquidity_position.rs +++ b/crates/bin/pcli/src/command/tx/liquidity_position.rs @@ -8,7 +8,7 @@ use penumbra_dex::{ }, TradingPair, }; -use rand_core::OsRng; +use rand_core::CryptoRngCore; use super::{replicate::ReplicateCmd, FeeTier}; @@ -106,7 +106,7 @@ pub enum OrderCmd { fee_tier: FeeTier, /// Duplicate the order for the given number of times. #[clap(short, long, default_value = "1")] - duplicate: u32, + num_copies: u32, }, Sell { /// The desired sale, formatted as a string, e.g. `100penumbra@1.2gm` would attempt @@ -126,7 +126,7 @@ pub enum OrderCmd { fee_tier: FeeTier, /// Duplicate the order for the given number of times. #[clap(short, long, default_value = "1")] - duplicate: u32, + num_copies: u32, }, } @@ -163,6 +163,7 @@ impl OrderCmd { &self, // Preserved since we'll need it after denom metadata refactor _asset_cache: &asset::Cache, + mut rng: impl CryptoRngCore, ) -> Result> { let positions = match self { OrderCmd::Buy { buy_order, .. } => { @@ -170,7 +171,7 @@ impl OrderCmd { let order = BuyOrder::parse_str(buy_order)?; let mut positions = Vec::new(); for _ in 0..self.duplicate() { - let mut position = order.into_position(OsRng); + let mut position = order.into_position(&mut rng); if self.is_auto_closing() { position.close_on_fill = true; } @@ -184,7 +185,7 @@ impl OrderCmd { let mut positions = Vec::new(); for _ in 0..self.duplicate() { - let mut position = order.into_position(OsRng); + let mut position = order.into_position(&mut rng); if self.is_auto_closing() { position.close_on_fill = true; }