tImproving imports (#4448) - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 469565c1881d3b73b065e3ce6092349523cda420
DIR parent a4da04110eab735d635407bd95d85d288b9a7241
HTML Author: Francisco J. Hernandez Heras <fjhheras@gmail.com>
Date: Tue, 19 Jun 2018 17:36:01 +0100
Improving imports (#4448)
Diffstat:
M lib/blockchain.py | 4 ++--
M lib/network.py | 6 ++----
M lib/verifier.py | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
---
DIR diff --git a/lib/blockchain.py b/lib/blockchain.py
t@@ -24,9 +24,9 @@ import os
import threading
from . import util
-from . import bitcoin
+from .bitcoin import Hash, hash_encode, int_to_hex, rev_hex
from . import constants
-from .bitcoin import *
+from .util import bfh, bh2u
MAX_TARGET = 0x00000000FFFF0000000000000000000000000000000000000000000000000000
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -23,7 +23,6 @@
import time
import queue
import os
-import stat
import errno
import random
import re
t@@ -40,7 +39,7 @@ import socks
from . import util
from . import bitcoin
-from .bitcoin import *
+from .bitcoin import COIN
from . import constants
from .interface import Connection, Interface
from . import blockchain
t@@ -54,7 +53,6 @@ SERVER_RETRY_INTERVAL = 10
def parse_servers(result):
""" parse servers list into dict format"""
- from .version import PROTOCOL_VERSION
servers = {}
for item in result:
host = item[1]
t@@ -983,7 +981,7 @@ class Network(util.DaemonThread):
def on_notify_header(self, interface, header_dict):
header_hex, height = header_dict['hex'], header_dict['height']
- header = blockchain.deserialize_header(bfh(header_hex), height)
+ header = blockchain.deserialize_header(util.bfh(header_hex), height)
if height < self.max_checkpoint():
self.connection_down(interface.server)
return
DIR diff --git a/lib/verifier.py b/lib/verifier.py
t@@ -21,7 +21,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from .util import ThreadJob
-from .bitcoin import *
+from .bitcoin import Hash, hash_decode, hash_encode
class SPV(ThreadJob):