gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes to solana-tokens (#10057)

Browse Source 
automerge
This commit is contained in:
Greg Fitzgerald
2020-05-14 22:23:35 -06:00
committed by GitHub
parent eb1acaf927
commit adcd2f14a5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tokens/src/commands.rs
View File

@@ -236,7 +236,7 @@ pub fn process_distribute_tokens<T: Client>(
let mut db = db::open_db(&args.transaction_db, args.dry_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);
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)?;
let opt_confirmations = finalize_transactions(client, &mut db)?;
let opt_confirmations = finalize_transactions(client, &mut db, args.dry_run)?;
Ok(opt_confirmations)
}
fn finalize_transactions<T: Client>(
client: &ThinClient<T>,
db: &mut PickleDb,
dry_run: bool,
) -> Result<Option<usize>, Error> {
if dry_run {
return Ok(None);
}
let mut opt_confirmations = update_finalized_transactions(client, db)?;
let progress_bar = new_spinner_progress_bar();