diff options
| author | Luke Dashjr <[email protected]> | 2012-08-12 17:16:40 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-08-12 17:19:48 +0000 |
| commit | cafa8f2879c255c4526709e77b3e42c5b2533b5e (patch) | |
| tree | 616fe57c52df382e48341f595871ff43721ea90c /src/test | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| parent | Bugfix: Fix a variety of misspellings (diff) | |
| download | discoin-cafa8f2879c255c4526709e77b3e42c5b2533b5e.tar.xz discoin-cafa8f2879c255c4526709e77b3e42c5b2533b5e.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/key.h
src/keystore.h
src/net.h
src/protocol.cpp
src/qt/guiutil.h
src/test/DoS_tests.cpp
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/DoS_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 0b8941404..2cbd4d5dc 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(DoS_banning) CNode dummyNode1(INVALID_SOCKET, addr1, true); dummyNode1.Misbehaving(100); // Should get banned BOOST_CHECK(CNode::IsBanned(addr1)); - BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different ip, not banned + BOOST_CHECK(!CNode::IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned CAddress addr2(ip(0xa0b0c002)); CNode dummyNode2(INVALID_SOCKET, addr2, true); |