aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/test-patches/temp-revert-1.patch21
-rw-r--r--contrib/test-patches/temp-revert-3.patch34
-rw-r--r--contrib/test-patches/temp-revert-4.patch110
-rw-r--r--src/main.cpp23
-rw-r--r--src/test/checkblock_tests.cpp2
5 files changed, 0 insertions, 190 deletions
diff --git a/contrib/test-patches/temp-revert-1.patch b/contrib/test-patches/temp-revert-1.patch
deleted file mode 100644
index a5aec641ce..0000000000
--- a/contrib/test-patches/temp-revert-1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 4dcc8701ac0eb09d8992d19fb411cee3c9aaf394
-Author: Matt Corallo <git@bluematt.me>
-Date: Sun Mar 24 20:45:44 2013 -0400
-
- Revert "Update unit test to match rule enforcement starts 21 March"
-
- This reverts commit d3e8c6a9d3fad68b0eee4434401ec7b3066399a2.
-
-diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
-index 3cfb6db..e167def 100644
---- a/src/test/checkblock_tests.cpp
-+++ b/src/test/checkblock_tests.cpp
-@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(May15)
- if (read_block("Mar12Fork.dat", forkingBlock))
- {
- CValidationState state;
-- forkingBlock.nTime = tMay15-1; // Invalidates PoW
-+ BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true));
- BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
-
- // After May 15'th, big blocks are OK:
diff --git a/contrib/test-patches/temp-revert-3.patch b/contrib/test-patches/temp-revert-3.patch
deleted file mode 100644
index 5c0775dfa5..0000000000
--- a/contrib/test-patches/temp-revert-3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit ba84709c65b911798ddae1285d807f4cd036990d
-Author: Matt Corallo <git@bluematt.me>
-Date: Sun Mar 24 20:45:56 2013 -0400
-
- Revert "Before 15 May, limit created block size to 500K"
-
- This reverts commit 402f19b64530775a7e4ded025c80d8c16a55e454.
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 22baf0f..51ada0a 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -2057,8 +2057,8 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
- return state.DoS(100, error("CheckBlock() : size limits failed"));
-
- // Special short-term limits to avoid 10,000 BDB lock limit:
-- if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT
-- GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00
-+ if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork
-+ GetBlockTime() < 1368576000) // 15 May 2013 00:00:00
- {
- // Rule is: #unique txids referenced <= 4,500
- // ... to prevent 10,000 BDB lock exhaustion on old clients
-@@ -4155,10 +4155,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
- // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
- nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
-
-- // Special compatibility rule before 15 May: limit size to 500,000 bytes:
-- if (GetAdjustedTime() < 1368576000)
-- nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN));
--
- // How much of the block should be dedicated to high-priority transactions,
- // included regardless of the fees they pay
- unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000);
diff --git a/contrib/test-patches/temp-revert-4.patch b/contrib/test-patches/temp-revert-4.patch
deleted file mode 100644
index f93d7549c0..0000000000
--- a/contrib/test-patches/temp-revert-4.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-commit ca96b88b61f647d4f56d5d06321dda08a43bf92f
-Author: Matt Corallo <git@bluematt.me>
-Date: Sun Mar 24 20:46:01 2013 -0400
-
- Revert "CheckBlock rule until 15-May for 10,000 BDB lock compatibility"
-
- This reverts commit 8c222dca4f961ad13ec64d690134a40d09b20813.
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 51ada0a..9a06dbf 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -2056,25 +2056,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
- if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
- return state.DoS(100, error("CheckBlock() : size limits failed"));
-
-- // Special short-term limits to avoid 10,000 BDB lock limit:
-- if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork
-- GetBlockTime() < 1368576000) // 15 May 2013 00:00:00
-- {
-- // Rule is: #unique txids referenced <= 4,500
-- // ... to prevent 10,000 BDB lock exhaustion on old clients
-- set<uint256> setTxIn;
-- for (size_t i = 0; i < vtx.size(); i++)
-- {
-- setTxIn.insert(vtx[i].GetHash());
-- if (i == 0) continue; // skip coinbase txin
-- BOOST_FOREACH(const CTxIn& txin, vtx[i].vin)
-- setTxIn.insert(txin.prevout.hash);
-- }
-- size_t nTxids = setTxIn.size();
-- if (nTxids > 4500)
-- return error("CheckBlock() : 15 May maxlocks violation");
-- }
--
- // Check proof of work matches claimed amount
- if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits))
- return state.DoS(50, error("CheckBlock() : proof of work failed"));
-diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
-deleted file mode 100644
-index e167def..0000000
---- a/src/test/checkblock_tests.cpp
-+++ /dev/null
-@@ -1,66 +0,0 @@
--//
--// Unit tests for block.CheckBlock()
--//
--#include <algorithm>
--
--#include <boost/assign/list_of.hpp> // for 'map_list_of()'
--#include <boost/date_time/posix_time/posix_time_types.hpp>
--#include <boost/test/unit_test.hpp>
--#include <boost/foreach.hpp>
--
--#include "main.h"
--#include "wallet.h"
--#include "net.h"
--#include "util.h"
--
--BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
--
--bool
--read_block(const std::string& filename, CBlock& block)
--{
-- namespace fs = boost::filesystem;
-- fs::path testFile = fs::current_path() / "test" / "data" / filename;
--#ifdef TEST_DATA_DIR
-- if (!fs::exists(testFile))
-- {
-- testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename;
-- }
--#endif
-- FILE* fp = fopen(testFile.string().c_str(), "rb");
-- if (!fp) return false;
--
-- fseek(fp, 8, SEEK_SET); // skip msgheader/size
--
-- CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION);
-- if (!filein) return false;
--
-- filein >> block;
--
-- return true;
--}
--
--BOOST_AUTO_TEST_CASE(May15)
--{
-- // Putting a 1MB binary file in the git repository is not a great
-- // idea, so this test is only run if you manually download
-- // test/data/Mar12Fork.dat from
-- // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download
-- unsigned int tMay15 = 1368576000;
-- SetMockTime(tMay15); // Test as if it was right at May 15
--
-- CBlock forkingBlock;
-- if (read_block("Mar12Fork.dat", forkingBlock))
-- {
-- CValidationState state;
-- BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true));
-- BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
--
-- // After May 15'th, big blocks are OK:
-- forkingBlock.nTime = tMay15; // Invalidates PoW
-- BOOST_CHECK(forkingBlock.CheckBlock(state, false, false));
-- }
--
-- SetMockTime(0);
--}
--
--BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/main.cpp b/src/main.cpp
index b7efac53b1..a03921e9b5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2073,25 +2073,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
return state.DoS(100, error("CheckBlock() : size limits failed"));
- // Special short-term limits to avoid 10,000 BDB lock limit:
- if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT
- GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00
- {
- // Rule is: #unique txids referenced <= 4,500
- // ... to prevent 10,000 BDB lock exhaustion on old clients
- set<uint256> setTxIn;
- for (size_t i = 0; i < vtx.size(); i++)
- {
- setTxIn.insert(vtx[i].GetHash());
- if (i == 0) continue; // skip coinbase txin
- BOOST_FOREACH(const CTxIn& txin, vtx[i].vin)
- setTxIn.insert(txin.prevout.hash);
- }
- size_t nTxids = setTxIn.size();
- if (nTxids > 4500)
- return error("CheckBlock() : 15 May maxlocks violation");
- }
-
// Check proof of work matches claimed amount
if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits))
return state.DoS(50, error("CheckBlock() : proof of work failed"));
@@ -4188,10 +4169,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
- // Special compatibility rule before 15 May: limit size to 500,000 bytes:
- if (GetAdjustedTime() < 1368576000)
- nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN));
-
// How much of the block should be dedicated to high-priority transactions,
// included regardless of the fees they pay
unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000);
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
index 3cfb6dbfa4..d626f9a6f4 100644
--- a/src/test/checkblock_tests.cpp
+++ b/src/test/checkblock_tests.cpp
@@ -52,8 +52,6 @@ BOOST_AUTO_TEST_CASE(May15)
if (read_block("Mar12Fork.dat", forkingBlock))
{
CValidationState state;
- forkingBlock.nTime = tMay15-1; // Invalidates PoW
- BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
// After May 15'th, big blocks are OK:
forkingBlock.nTime = tMay15; // Invalidates PoW