aboutsummaryrefslogtreecommitdiff
path: root/src/test/checkblock_tests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/checkblock_tests.cpp')
-rw-r--r--src/test/checkblock_tests.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
index d47a33fd4..51530c4de 100644
--- a/src/test/checkblock_tests.cpp
+++ b/src/test/checkblock_tests.cpp
@@ -1,10 +1,12 @@
-//
-// Unit tests for block.CheckBlock()
-//
-
-
+// Copyright (c) 2013-2014 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#include "clientversion.h"
+#include "consensus/validation.h"
#include "main.h"
+#include "test/test_bitcoin.h"
+#include "utiltime.h"
#include <cstdio>
@@ -13,10 +15,9 @@
#include <boost/test/unit_test.hpp>
-BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
+BOOST_FIXTURE_TEST_SUITE(CheckBlock_tests, BasicTestingSetup)
-bool
-read_block(const std::string& filename, CBlock& block)
+bool read_block(const std::string& filename, CBlock& block)
{
namespace fs = boost::filesystem;
fs::path testFile = fs::current_path() / "data" / filename;
@@ -31,8 +32,8 @@ read_block(const std::string& filename, CBlock& block)
fseek(fp, 8, SEEK_SET); // skip msgheader/size
- CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION);
- if (!filein) return false;
+ CAutoFile filein(fp, SER_DISK, CLIENT_VERSION);
+ if (filein.IsNull()) return false;
filein >> block;