diff options
| author | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2016-12-05 16:03:53 +0900 |
|---|---|---|
| committer | Kalle Alm <kalle.alm@gmail.com> | 2017-01-02 20:35:23 +0900 |
| commit | 73f41190b91dce9c125b1828b18f7625e0200145 (patch) | |
| tree | 7fbc5af2fa822231182c85df8d5d9826e8c1ecae /src/test/sigopcount_tests.cpp | |
| parent | 53442af0aac3838179fad79a65512ee8c5603922 (diff) | |
| download | bitcoin-73f41190b91dce9c125b1828b18f7625e0200145.tar.xz | |
Refactoring: Removed using namespace <xxx> from bench/ and test/ source files.
Diffstat (limited to 'src/test/sigopcount_tests.cpp')
| -rw-r--r-- | src/test/sigopcount_tests.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 3488a0befc..a34459fc83 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -15,8 +15,6 @@ #include <boost/foreach.hpp> #include <boost/test/unit_test.hpp> -using namespace std; - // Helpers: static std::vector<unsigned char> Serialize(const CScript& s) @@ -160,8 +158,8 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript scriptPubKey = GetScriptForWitness(p2pk); CScript scriptSig = CScript(); CScriptWitness scriptWitness; - scriptWitness.stack.push_back(vector<unsigned char>(0)); - scriptWitness.stack.push_back(vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness); @@ -190,8 +188,8 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript scriptPubKey = GetScriptForDestination(CScriptID(scriptSig)); scriptSig = CScript() << ToByteVector(scriptSig); CScriptWitness scriptWitness; - scriptWitness.stack.push_back(vector<unsigned char>(0)); - scriptWitness.stack.push_back(vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness); assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 1); @@ -204,9 +202,9 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript scriptPubKey = GetScriptForWitness(witnessScript); CScript scriptSig = CScript(); CScriptWitness scriptWitness; - scriptWitness.stack.push_back(vector<unsigned char>(0)); - scriptWitness.stack.push_back(vector<unsigned char>(0)); - scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end())); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(witnessScript.begin(), witnessScript.end())); BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness); assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2); @@ -221,9 +219,9 @@ BOOST_AUTO_TEST_CASE(GetTxSigOpCost) CScript scriptPubKey = GetScriptForDestination(CScriptID(redeemScript)); CScript scriptSig = CScript() << ToByteVector(redeemScript); CScriptWitness scriptWitness; - scriptWitness.stack.push_back(vector<unsigned char>(0)); - scriptWitness.stack.push_back(vector<unsigned char>(0)); - scriptWitness.stack.push_back(vector<unsigned char>(witnessScript.begin(), witnessScript.end())); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(0)); + scriptWitness.stack.push_back(std::vector<unsigned char>(witnessScript.begin(), witnessScript.end())); BuildTxs(spendingTx, coins, creationTx, scriptPubKey, scriptSig, scriptWitness); assert(GetTransactionSigOpCost(CTransaction(spendingTx), coins, flags) == 2); |