aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-12-21 22:33:19 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2011-12-21 22:33:19 +0100
commitbde280b9a4da2652716c8ffdeed9ebfa4461cc70 (patch)
treef2d96b0c74da35b701513a629817c7e944798827 /src/test
parent21d9f36781604e4ca9fc35dc65265593423b73e9 (diff)
Revert "Use standard C99 (and Qt) types for 64-bit integers"
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/DoS_tests.cpp10
-rw-r--r--src/test/base58_tests.cpp2
-rw-r--r--src/test/script_op_eval_tests.cpp2
-rw-r--r--src/test/uint160_tests.cpp4
-rw-r--r--src/test/uint256_tests.cpp4
-rw-r--r--src/test/util_tests.cpp4
6 files changed, 7 insertions, 19 deletions
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
index bea671c311..e9b7b4517a 100644
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -1,8 +1,6 @@
//
// Unit tests for denial-of-service detection/prevention code
//
-#include <stdint.h>
-
#include <boost/assign/list_of.hpp> // for 'map_list_of()'
#include <boost/test/unit_test.hpp>
#include <boost/foreach.hpp>
@@ -52,7 +50,7 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
BOOST_AUTO_TEST_CASE(DoS_bantime)
{
CNode::ClearBanned();
- int64_t nStartTime = GetTime();
+ int64 nStartTime = GetTime();
SetMockTime(nStartTime); // Overrides future calls to GetTime()
CAddress addr(0xa0b0c001);
@@ -68,11 +66,11 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
BOOST_CHECK(!CNode::IsBanned(addr.ip));
}
-static bool CheckNBits(unsigned int nbits1, int64_t time1, unsigned int nbits2, int64_t time2)
+static bool CheckNBits(unsigned int nbits1, int64 time1, unsigned int nbits2, int64 time2)
{
if (time1 > time2)
return CheckNBits(nbits2, time2, nbits1, time1);
- int64_t deltaTime = time2-time1;
+ int64 deltaTime = time2-time1;
CBigNum required;
required.SetCompact(ComputeMinWork(nbits1, deltaTime));
@@ -87,7 +85,7 @@ BOOST_AUTO_TEST_CASE(DoS_checknbits)
// Timestamps,nBits from the bitcoin blockchain.
// These are the block-chain checkpoint blocks
- typedef std::map<int64_t, unsigned int> BlockData;
+ typedef std::map<int64, unsigned int> BlockData;
BlockData chainData =
map_list_of(1239852051,486604799)(1262749024,486594666)
(1279305360,469854461)(1280200847,469830746)(1281678674,469809688)
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index 0ceff9f28f..d52ac74982 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
#include <boost/test/unit_test.hpp>
#include "main.h"
diff --git a/src/test/script_op_eval_tests.cpp b/src/test/script_op_eval_tests.cpp
index 14c025b425..c44642c6e9 100644
--- a/src/test/script_op_eval_tests.cpp
+++ b/src/test/script_op_eval_tests.cpp
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
#include <boost/assert.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/assign/list_inserter.hpp>
diff --git a/src/test/uint160_tests.cpp b/src/test/uint160_tests.cpp
index d986c30870..35cb35b25a 100644
--- a/src/test/uint160_tests.cpp
+++ b/src/test/uint160_tests.cpp
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
#include <boost/test/unit_test.hpp>
#include "uint256.h"
@@ -12,7 +10,7 @@ BOOST_AUTO_TEST_CASE(uint160_equality)
uint160 num2 = 11;
BOOST_CHECK(num1+1 == num2);
- uint64_t num3 = 10;
+ uint64 num3 = 10;
BOOST_CHECK(num1 == num3);
BOOST_CHECK(num1+num2 == num3+num2);
}
diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp
index d7e1e51379..efdc8a6aeb 100644
--- a/src/test/uint256_tests.cpp
+++ b/src/test/uint256_tests.cpp
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
#include <boost/test/unit_test.hpp>
#include "uint256.h"
@@ -12,7 +10,7 @@ BOOST_AUTO_TEST_CASE(uint256_equality)
uint256 num2 = 11;
BOOST_CHECK(num1+1 == num2);
- uint64_t num3 = 10;
+ uint64 num3 = 10;
BOOST_CHECK(num1 == num3);
BOOST_CHECK(num1+num2 == num3+num2);
}
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
index 08d243751e..9571c47382 100644
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@@ -1,5 +1,3 @@
-#include <stdint.h>
-
#include <vector>
#include <boost/test/unit_test.hpp>
#include <boost/foreach.hpp>
@@ -188,7 +186,7 @@ BOOST_AUTO_TEST_CASE(util_FormatMoney)
BOOST_AUTO_TEST_CASE(util_ParseMoney)
{
- int64_t ret = 0;
+ int64 ret = 0;
BOOST_CHECK(ParseMoney("0.0", ret));
BOOST_CHECK_EQUAL(ret, 0);