diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-08-27 13:39:24 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-08-27 13:39:46 -0400 |
| commit | fea4e9eca58b6ef69b413a5fa8efb5388c405fdd (patch) | |
| tree | f2e0778c8e9556427d7130cf4265ce8092711f82 /src/test | |
| parent | dd34204611e1dd13be441e2d54c8f659e9c7a9cd (diff) | |
| parent | dd777f3e1220dd1a76e8a29cafdd4fe6244c5c0f (diff) | |
| download | bitcoin-fea4e9eca58b6ef69b413a5fa8efb5388c405fdd.tar.xz | |
Merge #13767: Remove redundant assignments (dead stores)
dd777f3e12 Remove unused variable (practicalswift)
cdf4089457 Remove redundant assignments (dead stores) (practicalswift)
Pull request description:
Remove redundant assignments (dead stores).
Tree-SHA512: e852059b22a161c34a0f18a6a6ed798e2b35e6d2b9f23c526af0ec33e01f6a5bb1fa5ada6671ba183d7b02393ff0d397be5aa4b4e2edbd5e604c9a76ac48d249
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/descriptor_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/script_tests.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp index f189222be8..e739b84a48 100644 --- a/src/test/descriptor_tests.cpp +++ b/src/test/descriptor_tests.cpp @@ -64,7 +64,7 @@ void Check(const std::string& prv, const std::string& pub, int flags, const std: BOOST_CHECK_EQUAL(pub, pub2); // Check that both can be serialized with private key back to the private version, but not without private key. - std::string prv1, prv2; + std::string prv1; BOOST_CHECK(parse_priv->ToPrivateString(keys_priv, prv1)); BOOST_CHECK_EQUAL(prv, prv1); BOOST_CHECK(!parse_priv->ToPrivateString(keys_pub, prv1)); diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index bc671394c0..67c377778f 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -937,17 +937,19 @@ BOOST_AUTO_TEST_CASE(script_build) } } +#ifdef UPDATE_JSON_TESTS std::string strGen; - +#endif for (TestBuilder& test : tests) { test.Test(); std::string str = JSONPrettyPrint(test.GetJSON()); -#ifndef UPDATE_JSON_TESTS +#ifdef UPDATE_JSON_TESTS + strGen += str + ",\n"; +#else if (tests_set.count(str) == 0) { BOOST_CHECK_MESSAGE(false, "Missing auto script_valid test: " + test.GetComment()); } #endif - strGen += str + ",\n"; } #ifdef UPDATE_JSON_TESTS |