diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-27 13:20:50 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-27 13:20:53 +0200 |
| commit | c608b6daf97778edd84341aa25b0128e49bd529b (patch) | |
| tree | b01ea1e3eb88aefff33457f7be7490bca0e5a9a9 /qa/rpc-tests/smartfees.py | |
| parent | 68aff60e4aa64c2ea89584109ea0b3a493593dde (diff) | |
| parent | 7b7f258396432b6b4a0c111b06e34be03e42b000 (diff) | |
Merge pull request #6097
7b7f258 rpc-tests: remove python-bitcoinrpc directory (Jonas Schnelli)
a85b2e2 pull-tester/rpc-tests.sh: disable script_test.py test (Jonas Schnelli)
3e875b1 pull-tester/rpc-tests.sh: allow passing throug of arguments (Jonas Schnelli)
00706a5 update rpc-tests readme.md (Jonas Schnelli)
344e08e extend rpc-tests.sh control script with non-travis tests (Jonas Schnelli)
64937fe [QA] restructure rpc tests directory (Jonas Schnelli)
Diffstat (limited to 'qa/rpc-tests/smartfees.py')
| -rwxr-xr-x | qa/rpc-tests/smartfees.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py index 69f3c22c17..c15c5fda09 100755 --- a/qa/rpc-tests/smartfees.py +++ b/qa/rpc-tests/smartfees.py @@ -7,9 +7,8 @@ # Test fee estimation code # -from test_framework import BitcoinTestFramework -from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException -from util import * +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import * # Construct 2 trivial P2SH's and the ScriptSigs that spend them # So we can create many many transactions without needing to spend |