some string and indentation updates in init/rpcclient #3350

Diapolo commented at 12:59 PM on December 3, 2013: none

2nd commit: fix includes in rpcnet.cpp

in src/init.cpp:None in 93d7f42006 outdated

 266 | @@ -267,9 +267,9 @@ bool static Bind(const CService &addr, unsigned int flags) {
 267 |      strUsage += "  -par=<n>               " + _("Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)") + "\n";
 268 |  
 269 |      strUsage += "\n" + _("Block creation options:") + "\n";
 270 | -    strUsage += "  -blockminsize=<n>      "   + _("Set minimum block size in bytes (default: 0)") + "\n";
 271 | -    strUsage += "  -blockmaxsize=<n>      "   + _("Set maximum block size in bytes (default: 250000)") + "\n";
 272 | -    strUsage += "  -blockprioritysize=<n> "   + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n";
 273 | +    strUsage += "  -blockminsize=<n>      " + _("Set minimum block size in bytes (default: 0)") + "\n";
 274 | +    strUsage += "  -blockmaxsize=<n>      " + _("Set maximum block size in bytes (default: 250000)") + "\n";
 275 | +    strUsage += "  -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n";

wtogami commented at 7:51 PM on December 3, 2013:

250000 and 27000 change with 0.8.6 and likely another HEAD PR.

Diapolo commented at 10:58 AM on December 6, 2013:

You should keep an eye on those, I'm no core-code developer ;).

wtogami commented at 7:51 PM on December 3, 2013: contributor

ACK, although please coordinate with the default changes in other PR's.

super3 commented at 8:07 PM on December 3, 2013: contributor

ACK.

some string and indentation updates in init/rpcclient b6aafca03d

cleanup includes in rpcnet.cpp fdbdb7f345

in src/rpcnet.cpp:None in 7d65c24632 outdated

   0 | @@ -1,20 +1,19 @@
   1 |  // Copyright (c) 2009-2013 The Bitcoin developers
   2 |  // Distributed under the MIT/X11 software license, see the accompanying
   3 |  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
   4 | -#include "rpcserver.h"
   5 |  
   6 | +#include "rpcserver.h"
   7 |  
   8 | -#include "main.h"
   9 | +#include "main.h" // for getinfo

laanwj commented at 12:57 PM on December 9, 2013:

I guess you can remove the // for getinfo here, as main.h was already needed before that strange duck was moved to rpcnet.cpp

BitcoinPullTester commented at 1:21 PM on December 9, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/fdbdb7f3459603bfd977cff3c16473992485197a for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

Diapolo commented at 10:05 AM on December 10, 2013: none

Can we merge this, so we have time for translations updates before 0.9 RC phase please?

laanwj referenced this in commit 6939a0d50e on Dec 10, 2013

laanwj merged this on Dec 10, 2013

laanwj closed this on Dec 10, 2013

Diapolo deleted the branch on Dec 11, 2013

Bushstar referenced this in commit c9881d0fc7 on Apr 8, 2020

DrahtBot locked this on Sep 8, 2021