aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-12-13 10:08:39 +0100
committerWladimir J. van der Laan <[email protected]>2013-12-13 10:13:32 +0100
commit5e2fb330fd982cd9e01bc62dfc9fa8d8f7e09243 (patch)
treed176003961d9b2310b749235860399cb1281a06b
parentMerge pull request #3387 (diff)
parentupdate help for -blockmaxsize and blockprioritysize (diff)
downloaddiscoin-5e2fb330fd982cd9e01bc62dfc9fa8d8f7e09243.tar.xz
discoin-5e2fb330fd982cd9e01bc62dfc9fa8d8f7e09243.zip
Merge pull request #3409
a9a37c8 update help for -blockmaxsize and blockprioritysize (Philip Kaufmann)
-rw-r--r--src/init.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 72346be67..40dd2d04c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -11,10 +11,11 @@
#include "addrman.h"
#include "db.h"
-#include "rpcserver.h"
#include "checkpoints.h"
+#include "main.h"
#include "miner.h"
#include "net.h"
+#include "rpcserver.h"
#include "txdb.h"
#include "ui_interface.h"
#include "util.h"
@@ -282,8 +283,8 @@ std::string HelpMessage(HelpMessageMode hmm)
strUsage += "\n" + _("Block creation options:") + "\n";
strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n";
- strUsage += " -blockmaxsize=<n> " + _("Set maximum block size in bytes (default: 250000)") + "\n";
- strUsage += " -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n";
+ strUsage += " -blockmaxsize=<n> " + strprintf(_("Set maximum block size in bytes (default: %d)"), DEFAULT_BLOCK_MAX_SIZE) + "\n";
+ strUsage += " -blockprioritysize=<n> " + strprintf(_("Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), DEFAULT_BLOCK_PRIORITY_SIZE) + "\n";
strUsage += "\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n";
strUsage += " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n";