Merge #10107: Remove unused variable. Remove accidental trailing semicolons in Python code
85de9d4 Remove call to gettransaction(...) where the result is unused (practicalswift) bd02422 Remove accidental trailing semicolons in Python code (practicalswift) Tree-SHA512: 23ffb1ccc29bf73b334d62b274ab614cb40e2969147adccacbaecc69a410a661a9f2dd9e9cbc8a70bd2c7f345095efc68743f288eb866315e0e8731441ba01d0
This commit is contained in:
parent
404e244d1b
commit
94aa904c06
@ -67,7 +67,7 @@ class ZMQHandler():
|
|||||||
msg = yield from self.zmqSubSocket.recv_multipart()
|
msg = yield from self.zmqSubSocket.recv_multipart()
|
||||||
topic = msg[0]
|
topic = msg[0]
|
||||||
body = msg[1]
|
body = msg[1]
|
||||||
sequence = "Unknown";
|
sequence = "Unknown"
|
||||||
if len(msg[-1]) == 4:
|
if len(msg[-1]) == 4:
|
||||||
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
msgSequence = struct.unpack('<I', msg[-1])[-1]
|
||||||
sequence = str(msgSequence)
|
sequence = str(msgSequence)
|
||||||
|
@ -434,7 +434,7 @@ class ImportMultiTest (BitcoinTestFramework):
|
|||||||
address_assert = self.nodes[1].validateaddress(watchonly_address)
|
address_assert = self.nodes[1].validateaddress(watchonly_address)
|
||||||
assert_equal(address_assert['iswatchonly'], True)
|
assert_equal(address_assert['iswatchonly'], True)
|
||||||
assert_equal(address_assert['ismine'], False)
|
assert_equal(address_assert['ismine'], False)
|
||||||
assert_equal(address_assert['timestamp'], watchonly_timestamp);
|
assert_equal(address_assert['timestamp'], watchonly_timestamp)
|
||||||
|
|
||||||
# Bad or missing timestamps
|
# Bad or missing timestamps
|
||||||
self.log.info("Should throw on invalid or missing timestamp values")
|
self.log.info("Should throw on invalid or missing timestamp values")
|
||||||
|
Loading…
Reference in New Issue
Block a user