highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-05 05:02:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix txn_clone.py

Browse Source 
Solve merge conflict of test added in #5881 with #6097.
This commit is contained in:
Wladimir J. van der Laan
2015-07-02 20:39:44 +02:00
parent d6db1157bc
commit 3f16971442
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rpc-tests/txn_clone.py
View File

@ -7,8 +7,8 @@
# Test proper accounting with an equivalent malleability clone # Test proper accounting with an equivalent malleability clone
# #
from test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException from test_framework.authproxy import AuthServiceProxy, JSONRPCException
from decimal import Decimal from decimal import Decimal
from util import * from util import *
import os import os