From e978ff49970a186e11f791b31b7daa58d2673023 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 7 Aug 2015 17:20:22 +0200 Subject: [PATCH] Add help text to BuildCheckpoints. --- .../src/main/java/org/bitcoinj/tools/BuildCheckpoints.java | 7 +++++++ tools/src/main/java/org/bitcoinj/tools/WalletTool.java | 4 +--- .../org/bitcoinj/tools/build-checkpoints-help.txt | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tools/src/main/resources/org/bitcoinj/tools/build-checkpoints-help.txt diff --git a/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java b/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java index c971957a..01f142eb 100644 --- a/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java +++ b/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java @@ -26,6 +26,7 @@ import org.bitcoinj.store.MemoryBlockStore; import org.bitcoinj.utils.BriefLogFormatter; import org.bitcoinj.utils.Threading; import com.google.common.base.Charsets; +import com.google.common.io.Resources; import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; @@ -55,10 +56,16 @@ public class BuildCheckpoints { public static void main(String[] args) throws Exception { OptionParser parser = new OptionParser(); + parser.accepts("help"); OptionSpec netFlag = parser.accepts("net").withRequiredArg().ofType(NetworkEnum.class).defaultsTo(NetworkEnum.MAIN); OptionSpec daysFlag = parser.accepts("days").withRequiredArg().ofType(Integer.class).defaultsTo(30); OptionSet options = parser.parse(args); + if (options.has("help")) { + System.out.println(Resources.toString(BuildCheckpoints.class.getResource("build-checkpoints-help.txt"), Charsets.UTF_8)); + return; + } + String suffix; switch (netFlag.value(options)) { case MAIN: diff --git a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java index c6e90a18..84c01b9c 100644 --- a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java +++ b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java @@ -226,11 +226,9 @@ public class WalletTool { parser.accepts("dump-privkeys"); options = parser.parse(args); - final String HELP_TEXT = Resources.toString(WalletTool.class.getResource("wallet-tool-help.txt"), Charsets.UTF_8); - if (args.length == 0 || options.has("help") || options.nonOptionArguments().size() < 1 || options.nonOptionArguments().contains("help")) { - System.out.println(HELP_TEXT); + System.out.println(Resources.toString(WalletTool.class.getResource("wallet-tool-help.txt"), Charsets.UTF_8)); return; } diff --git a/tools/src/main/resources/org/bitcoinj/tools/build-checkpoints-help.txt b/tools/src/main/resources/org/bitcoinj/tools/build-checkpoints-help.txt new file mode 100644 index 00000000..d5fa2d5d --- /dev/null +++ b/tools/src/main/resources/org/bitcoinj/tools/build-checkpoints-help.txt @@ -0,0 +1,7 @@ +BuildCheckpoints: create checkpoint files to use with CheckpointManager + +Usage: build-checkpoints --flags + +>>> OPTIONS + --net=XXX Which network to connect to, defaults to MAIN, can also be TEST or REGTEST. + --days= How many days to keep as a safety margin. Checkpointing will be done up to this many days ago. \ No newline at end of file