Merge bitcoin#13767: Remove redundant assignments (dead stores)

MarcoFalke · MarcoFalke · commit fea4e9eca58b · 2018-08-27T13:39:46.000-04:00
dd777f3 Remove unused variable (practicalswift) cdf4089 Remove redundant assignments (dead stores) (practicalswift) Pull request description: Remove redundant assignments (dead stores). Tree-SHA512: e852059b22a161c34a0f18a6a6ed798e2b35e6d2b9f23c526af0ec33e01f6a5bb1fa5ada6671ba183d7b02393ff0d397be5aa4b4e2edbd5e604c9a76ac48d249
diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
@@ -80,18 +80,16 @@ static void SipHash_32b(benchmark::State& state)
 static void FastRandom_32bit(benchmark::State& state)
 {
     FastRandomContext rng(true);
-    uint32_t x = 0;
     while (state.KeepRunning()) {
-        x += rng.rand32();
+        rng.rand32();
     }
 }
 
 static void FastRandom_1bit(benchmark::State& state)
 {
     FastRandomContext rng(true);
-    uint32_t x = 0;
     while (state.KeepRunning()) {
-        x += rng.randbool();
+        rng.randbool();
     }
 }
 
diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp
@@ -12,7 +12,6 @@ static void RollingBloom(benchmark::State& state)
     CRollingBloomFilter filter(120000, 0.000001);
     std::vector<unsigned char> data(32);
     uint32_t count = 0;
-    uint64_t match = 0;
     while (state.KeepRunning()) {
         count++;
         data[0] = count;
@@ -25,7 +24,7 @@ static void RollingBloom(benchmark::State& state)
         data[1] = count >> 16;
         data[2] = count >> 8;
         data[3] = count;
-        match += filter.contains(data);
+        filter.contains(data);
     }
 }
 
diff --git 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
@@ -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
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -640,19 +640,14 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
         innerUsage += memusage::DynamicUsage(links.parents) + memusage::DynamicUsage(links.children);
         bool fDependsWait = false;
         setEntries setParentCheck;
-        int64_t parentSizes = 0;
-        int64_t parentSigOpCost = 0;
         for (const CTxIn &txin : tx.vin) {
             // Check that every mempool transaction's inputs refer to available coins, or other mempool tx's.
             indexed_transaction_set::const_iterator it2 = mapTx.find(txin.prevout.hash);
             if (it2 != mapTx.end()) {
                 const CTransaction& tx2 = it2->GetTx();
                 assert(tx2.vout.size() > txin.prevout.n && !tx2.vout[txin.prevout.n].IsNull());
                 fDependsWait = true;
-                if (setParentCheck.insert(it2).second) {
-                    parentSizes += it2->GetTxSize();
-                    parentSigOpCost += it2->GetSigOpCost();
-                }
+                setParentCheck.insert(it2);
             } else {
                 assert(pcoins->HaveCoin(txin.prevout));
             }

Original file line number	Diff line number	Diff line change
`@@ -80,18 +80,16 @@ static void SipHash_32b(benchmark::State& state)`
`80`	`80`	`static void FastRandom_32bit(benchmark::State& state)`
`81`	`81`	`{`
`82`	`82`	`FastRandomContext rng(true);`
`83`		`- uint32_t x = 0;`
`84`	`83`	`while (state.KeepRunning()) {`
`85`		`- x += rng.rand32();`
	`84`	`+ rng.rand32();`
`86`	`85`	`}`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`static void FastRandom_1bit(benchmark::State& state)`
`90`	`89`	`{`
`91`	`90`	`FastRandomContext rng(true);`
`92`		`- uint32_t x = 0;`
`93`	`91`	`while (state.KeepRunning()) {`
`94`		`- x += rng.randbool();`
	`92`	`+ rng.randbool();`
`95`	`93`	`}`
`96`	`94`	`}`
`97`	`95`
Original file line number	Diff line number	Diff line change
`@@ -937,17 +937,19 @@ BOOST_AUTO_TEST_CASE(script_build)`
`937`	`937`	`}`
`938`	`938`	`}`
`939`	`939`
	`940`	`+#ifdef UPDATE_JSON_TESTS`
`940`	`941`	`std::string strGen;`
`941`		`-`
	`942`	`+#endif`
`942`	`943`	`for (TestBuilder& test : tests) {`
`943`	`944`	`test.Test();`
`944`	`945`	`std::string str = JSONPrettyPrint(test.GetJSON());`
`945`		`-#ifndef UPDATE_JSON_TESTS`
	`946`	`+#ifdef UPDATE_JSON_TESTS`
	`947`	`+ strGen += str + ",\n";`
	`948`	`+#else`
`946`	`949`	`if (tests_set.count(str) == 0) {`
`947`	`950`	`BOOST_CHECK_MESSAGE(false, "Missing auto script_valid test: " + test.GetComment());`
`948`	`951`	`}`
`949`	`952`	`#endif`
`950`		`- strGen += str + ",\n";`
`951`	`953`	`}`
`952`	`954`
`953`	`955`	`#ifdef UPDATE_JSON_TESTS`