Merge bitcoin#9532: Remove unused variables

laanwj · laanwj · commit b709fe7ffc44 · 2017-02-07T15:28:50.000+01:00
90fd29b Remove unused int64_t nSinceLastSeen (practicalswift) ac4a095 Remove unused Python variables (practicalswift)
diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py
@@ -84,7 +84,6 @@ def b58decode_chk(v):
     result = b58decode(v)
     if result is None:
         return None
-    h3 = checksum(result[:-4])
     if result[-4:] == checksum(result[:-4]):
         return result[:-4]
     else:
diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py
@@ -45,7 +45,6 @@ def is_valid(v):
     result = b58decode_chk(v)
     if result is None:
         return False
-    valid = False
     for template in templates:
         prefix = str(bytearray(template[0]))
         suffix = str(bytearray(template[2]))
diff --git a/qa/rpc-tests/forknotify.py b/qa/rpc-tests/forknotify.py
@@ -22,7 +22,7 @@ def __init__(self):
     def setup_network(self):
         self.nodes = []
         self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
-        with open(self.alert_filename, 'w', encoding='utf8') as f:
+        with open(self.alert_filename, 'w', encoding='utf8'):
             pass  # Just open then close to create zero-length file
         self.nodes.append(start_node(0, self.options.tmpdir,
                             ["-blockversion=2", "-alertnotify=echo %s >> \"" + self.alert_filename + "\""]))
diff --git a/qa/rpc-tests/p2p-segwit.py b/qa/rpc-tests/p2p-segwit.py
@@ -951,7 +951,6 @@ def test_tx_relay_after_segwit_activation(self):
         tx.rehash()
 
         tx_hash = tx.sha256
-        tx_value = tx.vout[0].nValue
 
         # Verify that unnecessary witnesses are rejected.
         self.test_node.announce_tx_and_wait_for_getdata(tx)
diff --git a/qa/rpc-tests/receivedby.py b/qa/rpc-tests/receivedby.py
@@ -14,7 +14,6 @@ def get_sub_array_from_array(object_array, to_match):
         Finds and returns a sub array from an array of arrays.
         to_match should be a unique idetifier of a sub array
     '''
-    num_matched = 0
     for item in object_array:
         all_match = True
         for key,value in to_match.items():
@@ -104,7 +103,7 @@ def run_test(self):
         received_by_account_json = get_sub_array_from_array(self.nodes[1].listreceivedbyaccount(),{"account":account})
         if len(received_by_account_json) == 0:
             raise AssertionError("No accounts found in node")
-        balance_by_account = rec_by_accountArr = self.nodes[1].getreceivedbyaccount(account)
+        balance_by_account = self.nodes[1].getreceivedbyaccount(account)
 
         txid = self.nodes[0].sendtoaddress(addr, 0.1)
         self.sync_all()
diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py
@@ -393,7 +393,6 @@ def test_too_many_replacements(self):
         utxo = make_utxo(self.nodes[0], initial_nValue)
         fee = int(0.0001*COIN)
         split_value = int((initial_nValue-fee)/(MAX_REPLACEMENT_LIMIT+1))
-        actual_fee = initial_nValue - split_value*(MAX_REPLACEMENT_LIMIT+1)
 
         outputs = []
         for i in range(MAX_REPLACEMENT_LIMIT+1):
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
@@ -359,7 +359,6 @@ def run_test (self):
         rawtx = self.nodes[0].createrawtransaction([{"txid":singletxid, "vout":0}], {chain_addrs[0]:node0_balance/2-Decimal('0.01'), chain_addrs[1]:node0_balance/2-Decimal('0.01')})
         signedtx = self.nodes[0].signrawtransaction(rawtx)
         singletxid = self.nodes[0].sendrawtransaction(signedtx["hex"])
-        txids = [singletxid, singletxid]
         self.nodes[0].generate(1)
 
         # Make a long chain of unconfirmed payments without hitting mempool limit
diff --git a/src/addrman.cpp b/src/addrman.cpp
@@ -54,11 +54,8 @@ double CAddrInfo::GetChance(int64_t nNow) const
 {
     double fChance = 1.0;
 
-    int64_t nSinceLastSeen = nNow - nTime;
     int64_t nSinceLastTry = nNow - nLastTry;
 
-    if (nSinceLastSeen < 0)
-        nSinceLastSeen = 0;
     if (nSinceLastTry < 0)
         nSinceLastTry = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,8 @@ double CAddrInfo::GetChance(int64_t nNow) const`
`54`	`54`	`{`
`55`	`55`	`double fChance = 1.0;`
`56`	`56`
`57`		`- int64_t nSinceLastSeen = nNow - nTime;`
`58`	`57`	`int64_t nSinceLastTry = nNow - nLastTry;`
`59`	`58`
`60`		`- if (nSinceLastSeen < 0)`
`61`		`- nSinceLastSeen = 0;`
`62`	`59`	`if (nSinceLastTry < 0)`
`63`	`60`	`nSinceLastTry = 0;`
`64`	`61`