From b216b0b71f7853d747af8b712fc250c699f3c320 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Wed, 10 Jun 2020 11:56:44 -0400 Subject: [tests] sort imports in rpc_createmultisig.py --- test/functional/rpc_createmultisig.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'test/functional/rpc_createmultisig.py') diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py index 56e9ecfcc2..c5ec7fdecb 100755 --- a/test/functional/rpc_createmultisig.py +++ b/test/functional/rpc_createmultisig.py @@ -3,21 +3,20 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test multisig RPCs""" +import binascii +import decimal +import itertools +import json +import os from test_framework.authproxy import JSONRPCException from test_framework.descriptors import descsum_create, drop_origins +from test_framework.key import ECPubKey, ECKey, bytes_to_wif from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_raises_rpc_error, assert_equal, ) -from test_framework.key import ECPubKey, ECKey, bytes_to_wif - -import binascii -import decimal -import itertools -import json -import os class RpcCreateMultiSigTest(BitcoinTestFramework): def set_test_params(self): -- cgit v1.2.3 From 3a83a01694160f2e722e1bc90a328bd569b8e109 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Wed, 10 Jun 2020 12:10:02 -0400 Subject: [tests] move generate_wif_key to wallet_util.py generate_wif_key is a wallet utility function. Move it from the EC key module to the wallet util module. --- test/functional/rpc_createmultisig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/functional/rpc_createmultisig.py') diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py index c5ec7fdecb..3c81a4a4e2 100755 --- a/test/functional/rpc_createmultisig.py +++ b/test/functional/rpc_createmultisig.py @@ -11,12 +11,13 @@ import os from test_framework.authproxy import JSONRPCException from test_framework.descriptors import descsum_create, drop_origins -from test_framework.key import ECPubKey, ECKey, bytes_to_wif +from test_framework.key import ECPubKey, ECKey from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_raises_rpc_error, assert_equal, ) +from test_framework.wallet_util import bytes_to_wif class RpcCreateMultiSigTest(BitcoinTestFramework): def set_test_params(self): -- cgit v1.2.3