From 3d381807b2b7d68b48804245539d9c5f646d3bb3 Mon Sep 17 00:00:00 2001 From: 4tochka Date: Tue, 29 May 2018 18:19:52 +0400 Subject: [PATCH] PEP8 formating --- pybtc/address.py | 16 +- pybtc/block.py | 28 + pybtc/blockchain.py | 1 - pybtc/tools.py | 2 +- pybtc/transaction.py | 4 +- tests/test/block.py | 1160 +++++++++++++++++++++--------------------- 6 files changed, 619 insertions(+), 592 deletions(-) diff --git a/pybtc/address.py b/pybtc/address.py index 2f46a43..f16da58 100644 --- a/pybtc/address.py +++ b/pybtc/address.py @@ -1,5 +1,6 @@ from .tools import * + class PrivateKey(): def __init__(self, key=None, compressed=True, testnet=False): if key is None: @@ -34,7 +35,7 @@ class PrivateKey(): def hex(self): return hexlify(self.raw_key).decode() - def WIF(self, compressed=None, testnet=None): + def wif(self, compressed=None, testnet=None): if compressed is None: compressed = self.compressed if testnet is None: @@ -60,18 +61,16 @@ class PublicKey(): self.compressed = False self.raw_key = key - def hex(self): return hexlify(self.raw_key).decode() - class Address(): def __init__(self, key = None, - address_type="P2WPKH", testnet=False, compressed = True): + address_type="P2WPKH", testnet=False, compressed=True): if key is None: - self.private_key = PrivateKey(testnet = testnet, - compressed = compressed) + self.private_key = PrivateKey(testnet=testnet, + compressed=compressed) self.public_key = PublicKey(self.private_key) elif type(key) == PrivateKey: self.private_key = key @@ -92,7 +91,6 @@ class Address(): else: self.witness_version = None self.compressed = compressed - if address_type == "P2SH_P2WPKH": self.script_hash = True self.redeem_script = public_key_to_p2sh_p2wpkh_script(self.public_key.raw_key) @@ -102,5 +100,5 @@ class Address(): self.script_hash = False self.hash = hash160(self.public_key.raw_key) self.address = hash_to_address(self.hash, - script_hash = self.script_hash, - witness_version = self.witness_version) + script_hash=self.script_hash, + witness_version=self.witness_version) diff --git a/pybtc/block.py b/pybtc/block.py index e69de29..525d5bb 100644 --- a/pybtc/block.py +++ b/pybtc/block.py @@ -0,0 +1,28 @@ +from .tools import * +from .transaction import Transaction +from struct import pack, unpack + + +class Block(dict): + def __init__(self, block): + s = get_stream(block) + self["header"] = s.read(80) + self["hash"] = double_sha256(self["header"]) + self["version"] = unpack(">>",block.bits)