mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge #16598: test: Remove confusing hash256 function in util

Browse source 
afc0966d72 Moved and renamed hash256 from util.py to zmq_interface.py (Elichai Turkel)

Pull request description:

  Right now there are two `hash256(bytes)` in the test framework:
  first: https://github.com/bitcoin/bitcoin/blob/master/test/functional/test_framework/util.py#L186
  second: https://github.com/bitcoin/bitcoin/blob/master/test/functional/test_framework/messages.py#L60

  While they have the same name they're actually doing different things, one just does a sha256d and the other sha256d and reverses the bytes.
  so I renamed the second one to be `hash256r` to signify that it's hash256 reversed.

ACKs for top commit:
  MarcoFalke:
    unsigned ACK afc0966d72
  fanquake:
    ACK afc0966d72

Tree-SHA512: fb0e2db6f09c0248d92f2fd72d05a78cec1bebb44449239dbeecefa62cf4bd01d180b2e6dbcee48a8a9cea79a909e224256cabdd0739f334c2943647fe0c5fe4
This commit is contained in:
fanquake 2019-08-14 14:19:39 +08:00
commit 05ccbe9a29
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/functional/interface_zmq.py
View file

@ -7,15 +7,15 @@ import struct
from test_framework.address import ADDRESS_BCRT1_UNSPENDABLE from test_framework.address import ADDRESS_BCRT1_UNSPENDABLE
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.messages import CTransaction from test_framework.messages import CTransaction, hash256
from test_framework.util import ( from test_framework.util import assert_equal
assert_equal,
hash256,
)
from io import BytesIO from io import BytesIO
ADDRESS = "tcp://127.0.0.1:28332" ADDRESS = "tcp://127.0.0.1:28332"
def hash256_reversed(byte_str):
return hash256(byte_str)[::-1]
class ZMQSubscriber: class ZMQSubscriber:
def __init__(self, socket, topic): def __init__(self, socket, topic):
self.sequence = 0 self.sequence = 0
@ -103,7 +103,7 @@ class ZMQTest (BitcoinTestFramework):
# Should receive the generated raw block. # Should receive the generated raw block.
block = self.rawblock.receive() block = self.rawblock.receive()
assert_equal(genhashes[x], hash256(block[:80]).hex()) assert_equal(genhashes[x], hash256_reversed(block[:80]).hex())
if self.is_wallet_compiled(): if self.is_wallet_compiled():
self.log.info("Wait for tx from second node") self.log.info("Wait for tx from second node")
@ -116,7 +116,7 @@ class ZMQTest (BitcoinTestFramework):
# Should receive the broadcasted raw transaction. # Should receive the broadcasted raw transaction.
hex = self.rawtx.receive() hex = self.rawtx.receive()
assert_equal(payment_txid, hash256(hex).hex()) assert_equal(payment_txid, hash256_reversed(hex).hex())
self.log.info("Test the getzmqnotifications RPC") self.log.info("Test the getzmqnotifications RPC")

7
test/functional/test_framework/util.py
View file

@ -7,7 +7,6 @@
from base64 import b64encode from base64 import b64encode
from binascii import unhexlify from binascii import unhexlify
from decimal import Decimal, ROUND_DOWN from decimal import Decimal, ROUND_DOWN
import hashlib
import inspect import inspect
import json import json
import logging import logging
@ -183,12 +182,6 @@ def check_json_precision():
def count_bytes(hex_string): def count_bytes(hex_string):
return len(bytearray.fromhex(hex_string)) return len(bytearray.fromhex(hex_string))
def hash256(byte_str):
sha256 = hashlib.sha256()
sha256.update(byte_str)
sha256d = hashlib.sha256()
sha256d.update(sha256.digest())
return sha256d.digest()[::-1]
def hex_str_to_bytes(hex_str): def hex_str_to_bytes(hex_str):
return unhexlify(hex_str.encode('ascii')) return unhexlify(hex_str.encode('ascii'))