diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-03 15:35:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-03 15:54:35 +0200 |
| commit | ff5874bcf7e391acf3b454c11c21636547400818 (patch) | |
| tree | 5bf4080f939dcb44923edb98f3f13fdf9ae897f3 /qa/rpc-tests/bip68-112-113-p2p.py | |
| parent | e0b3e19816b62fdf6faeda44459f30945241fbd8 (diff) | |
| parent | 444480649f08e6037f8ac178224b30a82e9ad72e (diff) | |
| download | bitcoin-ff5874bcf7e391acf3b454c11c21636547400818.tar.xz | |
Merge #7778: [qa] Bug fixes and refactor
4444806 [qa] mininode: Combine struct.pack format strings (MarcoFalke)
faaa3c9 [qa] mininode: Catch exceptions in got_data (MarcoFalke)
fa2cea1 [qa] rpc-tests: Properly use integers, floats (MarcoFalke)
fa524d9 [qa] Use python2/3 syntax (MarcoFalke)
Diffstat (limited to 'qa/rpc-tests/bip68-112-113-p2p.py')
| -rwxr-xr-x | qa/rpc-tests/bip68-112-113-p2p.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/rpc-tests/bip68-112-113-p2p.py b/qa/rpc-tests/bip68-112-113-p2p.py index 7d3c59be3e..f391cb0b7a 100755 --- a/qa/rpc-tests/bip68-112-113-p2p.py +++ b/qa/rpc-tests/bip68-112-113-p2p.py @@ -11,7 +11,7 @@ from test_framework.blocktools import create_coinbase, create_block from test_framework.comptool import TestInstance, TestManager from test_framework.script import * from binascii import unhexlify -import cStringIO +from io import BytesIO import time ''' @@ -119,7 +119,7 @@ class BIP68_112_113Test(ComparisonTestFramework): outputs = { to_address : amount } rawtx = node.createrawtransaction(inputs, outputs) tx = CTransaction() - f = cStringIO.StringIO(unhexlify(rawtx)) + f = BytesIO(unhexlify(rawtx)) tx.deserialize(f) return tx @@ -127,7 +127,7 @@ class BIP68_112_113Test(ComparisonTestFramework): rawtx = ToHex(unsignedtx) signresult = node.signrawtransaction(rawtx) tx = CTransaction() - f = cStringIO.StringIO(unhexlify(signresult['hex'])) + f = BytesIO(unhexlify(signresult['hex'])) tx.deserialize(f) return tx |