diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-02-23 23:52:27 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-02-23 23:52:27 -0800 |
| commit | 0bd573d6662e2c07fe7afcf55cb926ce9be95644 (patch) | |
| tree | 4524cddfead70c76d81f00a27b4a45bacc3419ca /src/main.h | |
| parent | 7ea7c94cf9f4d02bda59e0e12def824714f20d22 (diff) | |
| parent | 69e077471434b4eb34ec4574c47f83956c51fa63 (diff) | |
| download | bitcoin-0bd573d6662e2c07fe7afcf55cb926ce9be95644.tar.xz | |
Merge pull request #2186 from Diapolo/misc_stuff
small changes in init, main, checkpoints.h and bitcoin-qt.pro
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index c1af0c3706..43c3051e4c 100644 --- a/src/main.h +++ b/src/main.h @@ -28,7 +28,7 @@ struct CBlockIndexWorkComparator; static const unsigned int MAX_BLOCK_SIZE = 1000000; /** The maximum size for mined blocks */ static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; -/** The maximum size for transactions we're willing to relay/mine **/ +/** The maximum size for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5; /** The maximum allowed number of signature check operations in a block (network rule) */ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; @@ -118,7 +118,6 @@ class CValidationState; struct CBlockTemplate; - /** Register a wallet to receive updates from core */ void RegisterWallet(CWallet* pwalletIn); /** Unregister a wallet from core */ @@ -1558,7 +1557,7 @@ public: } std::string ToString() const { - return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u..%u, time=%s..%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str()); + return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str()); } // update statistics (does not update nSize) |