-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pcli: duplicate positions: use a -n short flag to match auctions
- Loading branch information
1 parent
b7228bc
commit 78cda19
Showing
2 changed files
with
12 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. `[email protected]` 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, | ||
}, | ||
} | ||
|
||
|
@@ -152,25 +152,26 @@ impl OrderCmd { | |
} | ||
} | ||
|
||
pub fn duplicate(&self) -> u32 { | ||
pub fn num_copies(&self) -> u32 { | ||
match self { | ||
OrderCmd::Buy { duplicate, .. } => *duplicate, | ||
OrderCmd::Sell { duplicate, .. } => *duplicate, | ||
OrderCmd::Buy { num_copies, .. } => *num_copies, | ||
OrderCmd::Sell { num_copies, .. } => *num_copies, | ||
} | ||
} | ||
|
||
pub fn as_position( | ||
&self, | ||
// Preserved since we'll need it after denom metadata refactor | ||
_asset_cache: &asset::Cache, | ||
mut rng: impl CryptoRngCore, | ||
) -> Result<Vec<Position>> { | ||
let positions = match self { | ||
OrderCmd::Buy { buy_order, .. } => { | ||
tracing::info!(?buy_order, "parsing buy order"); | ||
let order = BuyOrder::parse_str(buy_order)?; | ||
let mut positions = Vec::new(); | ||
for _ in 0..self.duplicate() { | ||
let mut position = order.into_position(OsRng); | ||
for _ in 0..self.num_copies() { | ||
let mut position = order.into_position(&mut rng); | ||
if self.is_auto_closing() { | ||
position.close_on_fill = true; | ||
} | ||
|
@@ -183,8 +184,8 @@ impl OrderCmd { | |
let order = SellOrder::parse_str(sell_order)?; | ||
let mut positions = Vec::new(); | ||
|
||
for _ in 0..self.duplicate() { | ||
let mut position = order.into_position(OsRng); | ||
for _ in 0..self.num_copies() { | ||
let mut position = order.into_position(&mut rng); | ||
if self.is_auto_closing() { | ||
position.close_on_fill = true; | ||
} | ||
|