From adcd2f14a5ad6850e0237be4f9e3a7ad0b148b56 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Thu, 14 May 2020 22:23:35 -0600
Subject: [PATCH] Minor fixes to solana-tokens (#10057)

automerge
---
 tokens/src/arg_parser.rs | 2 +-
 tokens/src/commands.rs   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tokens/src/arg_parser.rs b/tokens/src/arg_parser.rs
index 96e38e208..e61bf8047 100644
--- a/tokens/src/arg_parser.rs
+++ b/tokens/src/arg_parser.rs
@@ -267,7 +267,7 @@ fn parse_balances_args(matches: &ArgMatches<'_>) -> BalancesArgs {
 
 fn parse_transaction_log_args(matches: &ArgMatches<'_>) -> 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),
     }
 }
diff --git a/tokens/src/commands.rs b/tokens/src/commands.rs
index efae68bde..0bb3612be 100644
--- a/tokens/src/commands.rs
+++ b/tokens/src/commands.rs
@@ -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();