diff options
author | MarcoFalke <falke.marco@gmail.com> | 2017-11-25 21:54:34 -0500 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2017-11-25 21:54:45 -0500 |
commit | a89221873a3ee2451c73b41bbe2d99d36f439d31 (patch) | |
tree | 4a5aa7f47cf303ca39cfa21878fa25453d896319 /test/functional | |
parent | a933cb14c75b9c79a02f8de8397a8eae405a264f (diff) | |
parent | f522fb7c9c121641ce552774e3993942106ec336 (diff) | |
download | bitcoin-a89221873a3ee2451c73b41bbe2d99d36f439d31.tar.xz |
Merge #11683: tests: Remove unused mininode functions {ser,deser}_int_vector(...). Remove unused imports.
f522fb7c9 tests: Remove unused mininode functions deser_int_vector(f) and ser_int_vector(l) (practicalswift)
0f3b752ec Remove unused imports (practicalswift)
Pull request description:
* Remove unused mininode functions `deser_int_vector(f)` and `ser_int_vector(l)`. Last use removed in 3858aabbd084b2cc4534c40a178bbcc22fb82968. Friendly ping @jnewbery :-)
* Remove unused imports.
Tree-SHA512: 840c5623eae9f929561f6e86816883c5904ec1af82fc8d5e56dee1c0b1fe22e8600c10f7358ed8b556b3aec8c65c4910f6eee30e8015a573c4df8bef91124d3e
Diffstat (limited to 'test/functional')
-rwxr-xr-x | test/functional/minchainwork.py | 2 | ||||
-rwxr-xr-x | test/functional/p2p-fingerprint.py | 1 | ||||
-rw-r--r-- | test/functional/test_framework/messages.py | 15 |
3 files changed, 1 insertions, 17 deletions
diff --git a/test/functional/minchainwork.py b/test/functional/minchainwork.py index 35cd7ad141..90a3de0e0d 100755 --- a/test/functional/minchainwork.py +++ b/test/functional/minchainwork.py @@ -18,7 +18,7 @@ only succeeds past a given node once its nMinimumChainWork has been exceeded. import time from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import sync_blocks, connect_nodes, assert_equal +from test_framework.util import connect_nodes, assert_equal # 2 hashes required per regtest block (with no difficulty adjustment) REGTEST_WORK_PER_BLOCK = 2 diff --git a/test/functional/p2p-fingerprint.py b/test/functional/p2p-fingerprint.py index 4b6446fc5b..a8ce68374c 100755 --- a/test/functional/p2p-fingerprint.py +++ b/test/functional/p2p-fingerprint.py @@ -24,7 +24,6 @@ from test_framework.mininode import ( from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, - p2p_port, ) class P2PFingerprintTest(BitcoinTestFramework): diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 40d02f3ee0..eee24910cb 100644 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -167,21 +167,6 @@ def ser_string_vector(l): return r -def deser_int_vector(f): - nit = deser_compact_size(f) - r = [] - for i in range(nit): - t = struct.unpack("<i", f.read(4))[0] - r.append(t) - return r - - -def ser_int_vector(l): - r = ser_compact_size(len(l)) - for i in l: - r += struct.pack("<i", i) - return r - # Deserialize from a hex string representation (eg from RPC) def FromHex(obj, hex_string): obj.deserialize(BytesIO(hex_str_to_bytes(hex_string))) |