From e9f016b753385d43b806718ea261e589d0275cb2 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sat, 1 Nov 2014 15:29:31 +0100
Subject: [PATCH] Rename wallet-tool option --net=PROD to --net=MAIN. PROD can
 still be used as an alias to MAIN.

The mainnet blockchain file is renamed to mainnet.chain.
---
 tools/src/main/java/org/bitcoinj/tools/WalletTool.java    | 8 +++++---
 .../resources/org/bitcoinj/tools/wallet-tool-help.txt     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java
index 3ea00151..744596c0 100644
--- a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java
+++ b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java
@@ -180,7 +180,8 @@ public class WalletTool {
     }
     
     public enum NetworkEnum {
-        PROD,
+        MAIN,
+        PROD, // alias for MAIN
         TEST,
         REGTEST
     }
@@ -198,7 +199,7 @@ public class WalletTool {
         OptionSpec<String> walletFileName = parser.accepts("wallet").withRequiredArg().defaultsTo("wallet");
         seedFlag = parser.accepts("seed").withRequiredArg();
         watchFlag = parser.accepts("watchkey").withRequiredArg();
-        OptionSpec<NetworkEnum> netFlag = parser.accepts("net").withOptionalArg().ofType(NetworkEnum.class).defaultsTo(NetworkEnum.PROD);
+        OptionSpec<NetworkEnum> netFlag = parser.accepts("net").withOptionalArg().ofType(NetworkEnum.class).defaultsTo(NetworkEnum.MAIN);
         dateFlag = parser.accepts("date").withRequiredArg().ofType(Date.class)
                 .withValuesConvertedBy(DateConverter.datePattern("yyyy/MM/dd"));
         OptionSpec<WaitForEnum> waitForFlag = parser.accepts("waitfor").withRequiredArg().ofType(WaitForEnum.class);
@@ -255,9 +256,10 @@ public class WalletTool {
             logger.setLevel(Level.SEVERE);
         }
         switch (netFlag.value(options)) {
+            case MAIN:
             case PROD:
                 params = MainNetParams.get();
-                chainFileName = new File("prodnet.chain");
+                chainFileName = new File("mainnet.chain");
                 break;
             case TEST:
                 params = TestNet3Params.get();
diff --git a/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt b/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt
index a466566c..0ba1ede8 100644
--- a/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt
+++ b/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt
@@ -55,7 +55,7 @@ Usage: wallet-tool --flags action-name
 
 >>> GENERAL OPTIONS
   --debuglog           Enables logging from the core library.
-  --net=XXX            Which network to connect to, defaults to PROD, can also be TEST or REGTEST.
+  --net=XXX            Which network to connect to, defaults to MAIN, can also be TEST or REGTEST.
   --mode=FULL/SPV      Whether to do full verification of the chain or just light mode.
   --wallet=<file>      Specifies what wallet file to load and save.
   --chain=<file>       Specifies the name of the file that stores the block chain.