diff options
| author | Luke Dashjr <[email protected]> | 2012-08-12 17:22:59 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-08-12 17:22:59 +0000 |
| commit | 92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25 (patch) | |
| tree | 16335bc5d2d0fc03dfb38154b49233ad9b35f93d /src/test | |
| parent | Merge branch '0.6.0.x' into 0.6.x (diff) | |
| parent | Bugfix: Fix a variety of misspellings (diff) | |
| download | discoin-92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25.tar.xz discoin-92dfcea0e986e000e9f5ee8d7f6b847a5bd41d25.zip | |
Merge branch '0.6.0.x' into 0.6.x
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/DoS_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/script_P2SH_tests.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 4ee2e9483..91ae23194 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -37,7 +37,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); diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index aa72c0009..b84b90372 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE(norecurse) // Should not verify, because it will try to execute OP_INVALIDOPCODE BOOST_CHECK(!Verify(scriptSig, p2sh, true)); - // Try to recurse, and verification should succeed because + // Try to recur, and verification should succeed because // the inner HASH160 <> EQUAL should only check the hash: CScript p2sh2; p2sh2.SetPayToScriptHash(p2sh); @@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(is) BOOST_AUTO_TEST_CASE(switchover) { - // Test switchover code + // Test switch over code CScript notValid; notValid << OP_11 << OP_12 << OP_EQUALVERIFY; CScript scriptSig; |