diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-24 22:24:46 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-10-17 13:44:14 -0400 |
| commit | 066e2a1403fe306787a2ce0c8571aa9de57386cf (patch) | |
| tree | 5a4257c467978f1260a0d69e937c16ba16a01773 /src/test/sigopcount_tests.cpp | |
| parent | e8f6d54f1f58d9a5998e37367b84b427e51e1ad7 (diff) | |
| download | bitcoin-066e2a1403fe306787a2ce0c8571aa9de57386cf.tar.xz | |
script: move CScriptID to standard.h and add a ctor for creating them from CScripts
This allows for a reversal of the current behavior.
This:
CScript foo;
CScriptID bar(foo.GetID());
Becomes:
CScript foo;
CScriptID bar(foo);
This way, CScript is no longer dependent on CScriptID or Hash();
Diffstat (limited to 'src/test/sigopcount_tests.cpp')
| -rw-r--r-- | src/test/sigopcount_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 62a6cd63d6..4ce2c87a0d 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount) BOOST_CHECK_EQUAL(s1.GetSigOpCount(true), 3U); BOOST_CHECK_EQUAL(s1.GetSigOpCount(false), 21U); - CScript p2sh = GetScriptForDestination(s1.GetID()); + CScript p2sh = GetScriptForDestination(CScriptID(s1)); CScript scriptSig; scriptSig << OP_0 << Serialize(s1); BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig), 3U); @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(GetSigOpCount) BOOST_CHECK_EQUAL(s2.GetSigOpCount(true), 3U); BOOST_CHECK_EQUAL(s2.GetSigOpCount(false), 20U); - p2sh = GetScriptForDestination(s2.GetID()); + p2sh = GetScriptForDestination(CScriptID(s2)); BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(true), 0U); BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(false), 0U); CScript scriptSig2; |