diff options
| author | Gregory Maxwell <greg@xiph.org> | 2015-10-27 18:06:47 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2015-10-27 18:07:03 -0700 |
| commit | d0badb916e511da158c3626142745dfb14bd68e0 (patch) | |
| tree | 4057b56ca2f37870d9897beb978fc127bf236d13 | |
| parent | 8f3b3cdee497b8a1d7c6a7279e7bb13435527b60 (diff) | |
| parent | 298e040bca0aad62b616a1d3e66e1e44d2b9bd3a (diff) | |
| download | bitcoin-d0badb916e511da158c3626142745dfb14bd68e0.tar.xz | |
Merge pull request #6865
298e040 Fix chainstate serialized_size computation (Pieter Wuille)
| -rwxr-xr-x | qa/rpc-tests/blockchain.py | 2 | ||||
| -rw-r--r-- | src/txdb.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/blockchain.py b/qa/rpc-tests/blockchain.py index a5c98b777e..b7bfe36285 100755 --- a/qa/rpc-tests/blockchain.py +++ b/qa/rpc-tests/blockchain.py @@ -43,7 +43,7 @@ class BlockchainTest(BitcoinTestFramework): assert_equal(res[u'transactions'], 200) assert_equal(res[u'height'], 200) assert_equal(res[u'txouts'], 200) - assert_equal(res[u'bytes_serialized'], 13000), + assert_equal(res[u'bytes_serialized'], 13924), assert_equal(len(res[u'bestblock']), 64) assert_equal(len(res[u'hash_serialized']), 64) diff --git a/src/txdb.cpp b/src/txdb.cpp index f0868a1ebf..cd76c0155c 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -121,7 +121,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) const { nTotalAmount += out.nValue; } } - stats.nSerializedSize += 32 + pcursor->GetKeySize(); + stats.nSerializedSize += 32 + pcursor->GetValueSize(); ss << VARINT(0); } else { return error("CCoinsViewDB::GetStats() : unable to read value"); |