From faa8f68943615785a2855676cf96e0e96f3cc6bd Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 4 Jan 2021 11:20:02 +0100 Subject: Replace boost::variant with std::variant --- src/test/script_standard_tests.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/test/script_standard_tests.cpp') diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp index fb84b7f2ac..366385b619 100644 --- a/src/test/script_standard_tests.cpp +++ b/src/test/script_standard_tests.cpp @@ -183,23 +183,23 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestination) s.clear(); s << ToByteVector(pubkey) << OP_CHECKSIG; BOOST_CHECK(ExtractDestination(s, address)); - BOOST_CHECK(boost::get(&address) && - *boost::get(&address) == PKHash(pubkey)); + BOOST_CHECK(std::get_if(&address) && + *std::get_if(&address) == PKHash(pubkey)); // TxoutType::PUBKEYHASH s.clear(); s << OP_DUP << OP_HASH160 << ToByteVector(pubkey.GetID()) << OP_EQUALVERIFY << OP_CHECKSIG; BOOST_CHECK(ExtractDestination(s, address)); - BOOST_CHECK(boost::get(&address) && - *boost::get(&address) == PKHash(pubkey)); + BOOST_CHECK(std::get_if(&address) && + *std::get_if(&address) == PKHash(pubkey)); // TxoutType::SCRIPTHASH CScript redeemScript(s); // initialize with leftover P2PKH script s.clear(); s << OP_HASH160 << ToByteVector(CScriptID(redeemScript)) << OP_EQUAL; BOOST_CHECK(ExtractDestination(s, address)); - BOOST_CHECK(boost::get(&address) && - *boost::get(&address) == ScriptHash(redeemScript)); + BOOST_CHECK(std::get_if(&address) && + *std::get_if(&address) == ScriptHash(redeemScript)); // TxoutType::MULTISIG s.clear(); @@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestination) BOOST_CHECK(ExtractDestination(s, address)); WitnessV0KeyHash keyhash; CHash160().Write(pubkey).Finalize(keyhash); - BOOST_CHECK(boost::get(&address) && *boost::get(&address) == keyhash); + BOOST_CHECK(std::get_if(&address) && *std::get_if(&address) == keyhash); // TxoutType::WITNESS_V0_SCRIPTHASH s.clear(); @@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestination) CSHA256().Write(redeemScript.data(), redeemScript.size()).Finalize(scripthash.begin()); s << OP_0 << ToByteVector(scripthash); BOOST_CHECK(ExtractDestination(s, address)); - BOOST_CHECK(boost::get(&address) && *boost::get(&address) == scripthash); + BOOST_CHECK(std::get_if(&address) && *std::get_if(&address) == scripthash); // TxoutType::WITNESS_UNKNOWN with unknown version s.clear(); @@ -235,7 +235,7 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestination) unk.length = 33; unk.version = 1; std::copy(pubkey.begin(), pubkey.end(), unk.program); - BOOST_CHECK(boost::get(&address) && *boost::get(&address) == unk); + BOOST_CHECK(std::get_if(&address) && *std::get_if(&address) == unk); } BOOST_AUTO_TEST_CASE(script_standard_ExtractDestinations) @@ -259,8 +259,8 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestinations) BOOST_CHECK_EQUAL(whichType, TxoutType::PUBKEY); BOOST_CHECK_EQUAL(addresses.size(), 1U); BOOST_CHECK_EQUAL(nRequired, 1); - BOOST_CHECK(boost::get(&addresses[0]) && - *boost::get(&addresses[0]) == PKHash(pubkeys[0])); + BOOST_CHECK(std::get_if(&addresses[0]) && + *std::get_if(&addresses[0]) == PKHash(pubkeys[0])); // TxoutType::PUBKEYHASH s.clear(); @@ -269,8 +269,8 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestinations) BOOST_CHECK_EQUAL(whichType, TxoutType::PUBKEYHASH); BOOST_CHECK_EQUAL(addresses.size(), 1U); BOOST_CHECK_EQUAL(nRequired, 1); - BOOST_CHECK(boost::get(&addresses[0]) && - *boost::get(&addresses[0]) == PKHash(pubkeys[0])); + BOOST_CHECK(std::get_if(&addresses[0]) && + *std::get_if(&addresses[0]) == PKHash(pubkeys[0])); // TxoutType::SCRIPTHASH CScript redeemScript(s); // initialize with leftover P2PKH script @@ -280,8 +280,8 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestinations) BOOST_CHECK_EQUAL(whichType, TxoutType::SCRIPTHASH); BOOST_CHECK_EQUAL(addresses.size(), 1U); BOOST_CHECK_EQUAL(nRequired, 1); - BOOST_CHECK(boost::get(&addresses[0]) && - *boost::get(&addresses[0]) == ScriptHash(redeemScript)); + BOOST_CHECK(std::get_if(&addresses[0]) && + *std::get_if(&addresses[0]) == ScriptHash(redeemScript)); // TxoutType::MULTISIG s.clear(); @@ -293,10 +293,10 @@ BOOST_AUTO_TEST_CASE(script_standard_ExtractDestinations) BOOST_CHECK_EQUAL(whichType, TxoutType::MULTISIG); BOOST_CHECK_EQUAL(addresses.size(), 2U); BOOST_CHECK_EQUAL(nRequired, 2); - BOOST_CHECK(boost::get(&addresses[0]) && - *boost::get(&addresses[0]) == PKHash(pubkeys[0])); - BOOST_CHECK(boost::get(&addresses[1]) && - *boost::get(&addresses[1]) == PKHash(pubkeys[1])); + BOOST_CHECK(std::get_if(&addresses[0]) && + *std::get_if(&addresses[0]) == PKHash(pubkeys[0])); + BOOST_CHECK(std::get_if(&addresses[1]) && + *std::get_if(&addresses[1]) == PKHash(pubkeys[1])); // TxoutType::NULL_DATA s.clear(); -- cgit v1.2.3