diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-02-03 05:41:13 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-02-03 05:41:13 +0000 |
| commit | a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc (patch) | |
| tree | 7e3932c75353499d6659b4f5a94b40e07e64c364 /qa/rpc-tests/bipdersig-p2p.py | |
| parent | 027fdb83b41ae9e9125cf61f6460c03ab34e5961 (diff) | |
| parent | fd13fe7ca01b6104ce591af2b90ee6951ccc5a16 (diff) | |
| download | bitcoin-a68bb9f5e7ef1da5c044907dc3a1d3d4a4dbc2cc.tar.xz | |
Merge branch 'master' into single_prodname
Diffstat (limited to 'qa/rpc-tests/bipdersig-p2p.py')
| -rwxr-xr-x | qa/rpc-tests/bipdersig-p2p.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py index ec1678cc2c..544e4a9670 100755 --- a/qa/rpc-tests/bipdersig-p2p.py +++ b/qa/rpc-tests/bipdersig-p2p.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2 -# +# Copyright (c) 2015 The Bitcoin Core developers # Distributed under the MIT/X11 software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # @@ -10,7 +10,7 @@ from test_framework.mininode import CTransaction, NetworkThread from test_framework.blocktools import create_coinbase, create_block from test_framework.comptool import TestInstance, TestManager from test_framework.script import CScript -from binascii import hexlify, unhexlify +from binascii import unhexlify import cStringIO import time |