parent
eb1acaf927
commit
adcd2f14a5
|
@ -267,7 +267,7 @@ fn parse_balances_args(matches: &ArgMatches<'_>) -> BalancesArgs {
|
||||||
|
|
||||||
fn parse_transaction_log_args(matches: &ArgMatches<'_>) -> TransactionLogArgs {
|
fn parse_transaction_log_args(matches: &ArgMatches<'_>) -> TransactionLogArgs {
|
||||||
TransactionLogArgs {
|
TransactionLogArgs {
|
||||||
transaction_db: value_t_or_exit!(matches, "transaction_db", String),
|
transaction_db: create_db_path(value_t!(matches, "campaign_name", String).ok()),
|
||||||
output_path: value_t_or_exit!(matches, "output_path", String),
|
output_path: value_t_or_exit!(matches, "output_path", String),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -236,7 +236,7 @@ pub fn process_distribute_tokens<T: Client>(
|
||||||
let mut db = db::open_db(&args.transaction_db, args.dry_run)?;
|
let mut db = db::open_db(&args.transaction_db, args.dry_run)?;
|
||||||
|
|
||||||
// Start by finalizing any transactions from the previous run.
|
// Start by finalizing any transactions from the previous run.
|
||||||
let confirmations = finalize_transactions(client, &mut db)?;
|
let confirmations = finalize_transactions(client, &mut db, args.dry_run)?;
|
||||||
|
|
||||||
let transaction_infos = db::read_transaction_infos(&db);
|
let transaction_infos = db::read_transaction_infos(&db);
|
||||||
apply_previous_transactions(&mut allocations, &transaction_infos);
|
apply_previous_transactions(&mut allocations, &transaction_infos);
|
||||||
|
@ -292,14 +292,19 @@ pub fn process_distribute_tokens<T: Client>(
|
||||||
|
|
||||||
distribute_tokens(client, &mut db, &allocations, args)?;
|
distribute_tokens(client, &mut db, &allocations, args)?;
|
||||||
|
|
||||||
let opt_confirmations = finalize_transactions(client, &mut db)?;
|
let opt_confirmations = finalize_transactions(client, &mut db, args.dry_run)?;
|
||||||
Ok(opt_confirmations)
|
Ok(opt_confirmations)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn finalize_transactions<T: Client>(
|
fn finalize_transactions<T: Client>(
|
||||||
client: &ThinClient<T>,
|
client: &ThinClient<T>,
|
||||||
db: &mut PickleDb,
|
db: &mut PickleDb,
|
||||||
|
dry_run: bool,
|
||||||
) -> Result<Option<usize>, Error> {
|
) -> Result<Option<usize>, Error> {
|
||||||
|
if dry_run {
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
|
||||||
let mut opt_confirmations = update_finalized_transactions(client, db)?;
|
let mut opt_confirmations = update_finalized_transactions(client, db)?;
|
||||||
|
|
||||||
let progress_bar = new_spinner_progress_bar();
|
let progress_bar = new_spinner_progress_bar();
|
||||||
|
|
Loading…
Reference in New Issue