Merge pull request #4624

This commit is contained in:
Jeff Garzik 2014-08-19 12:11:50 -04:00
commit fb11427e54
Failed to extract signature
7 changed files with 100 additions and 3 deletions

1
.gitignore vendored
View File

@ -43,6 +43,7 @@ src/qt/test/moc*.cpp
*.bak *.bak
*.rej *.rej
*.orig *.orig
*.pyc
*.o *.o
*.o-* *.o-*
*.patch *.patch

View File

@ -1,8 +1,15 @@
TESTS += test/test_bitcoin TESTS += test/test_bitcoin test/bitcoin-util-test.py
bin_PROGRAMS += test/test_bitcoin bin_PROGRAMS += test/test_bitcoin
TEST_SRCDIR = test TEST_SRCDIR = test
TEST_BINARY=test/test_bitcoin$(EXEEXT) TEST_BINARY=test/test_bitcoin$(EXEEXT)
EXTRA_DIST += \
test/bctest.py \
test/bitcoin-util-test.py \
test/data/bitcoin-util-test.json \
test/data/blanktx.hex
JSON_TEST_FILES = \ JSON_TEST_FILES = \
test/data/script_valid.json \ test/data/script_valid.json \
test/data/base58_keys_valid.json \ test/data/base58_keys_valid.json \

View File

@ -13,6 +13,7 @@
#include <stdio.h> #include <stdio.h>
#include <boost/assign/list_of.hpp> #include <boost/assign/list_of.hpp>
#include <boost/algorithm/string.hpp>
using namespace std; using namespace std;
using namespace boost::assign; using namespace boost::assign;
@ -501,13 +502,34 @@ static void OutputTx(const CTransaction& tx)
OutputTxHex(tx); OutputTxHex(tx);
} }
static string readStdin()
{
char buf[4096];
string ret;
while (!feof(stdin)) {
size_t bread = fread(buf, 1, sizeof(buf), stdin);
ret.append(buf, bread);
if (bread < sizeof(buf))
break;
}
if (ferror(stdin))
throw runtime_error("error reading stdin");
boost::algorithm::trim_right(ret);
return ret;
}
static int CommandLineRawTx(int argc, char* argv[]) static int CommandLineRawTx(int argc, char* argv[])
{ {
string strPrint; string strPrint;
int nRet = 0; int nRet = 0;
try { try {
// Skip switches // Skip switches; Permit common stdin convention "-"
while (argc > 1 && IsSwitchChar(argv[1][0])) { while (argc > 1 && IsSwitchChar(argv[1][0]) &&
(argv[1][1] != 0)) {
argc--; argc--;
argv++; argv++;
} }
@ -522,6 +544,8 @@ static int CommandLineRawTx(int argc, char* argv[])
// param: hex-encoded bitcoin transaction // param: hex-encoded bitcoin transaction
string strHexTx(argv[1]); string strHexTx(argv[1]);
if (strHexTx == "-") // "-" implies standard input
strHexTx = readStdin();
if (!DecodeHexTx(txDecodeTmp, strHexTx)) if (!DecodeHexTx(txDecodeTmp, strHexTx))
throw runtime_error("invalid transaction encoding"); throw runtime_error("invalid transaction encoding");

43
src/test/bctest.py Normal file
View File

@ -0,0 +1,43 @@
# Copyright 2014 BitPay, Inc.
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
import subprocess
import os
import json
import sys
def bctest(testDir, testObj):
execargs = testObj['exec']
stdinCfg = None
inputData = None
if "input" in testObj:
filename = testDir + "/" + testObj['input']
inputData = open(filename).read()
stdinCfg = subprocess.PIPE
outputFn = testObj['output_cmp']
outputData = open(testDir + "/" + outputFn).read()
proc = subprocess.Popen(execargs, stdin=stdinCfg, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
try:
outs = proc.communicate(input=inputData)
except OSError:
print("OSError, Failed to execute " + execargs[0])
sys.exit(1)
if outs[0] != outputData:
print("Output data mismatch for " + outputFn)
sys.exit(1)
def bctester(testDir, input_basename):
input_filename = testDir + "/" + input_basename
raw_data = open(input_filename).read()
input_data = json.loads(raw_data)
for testObj in input_data:
bctest(testDir, testObj)
sys.exit(0)

12
src/test/bitcoin-util-test.py Executable file
View File

@ -0,0 +1,12 @@
#!/usr/bin/python
# Copyright 2014 BitPay, Inc.
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
import os
import bctest
if __name__ == '__main__':
bctest.bctester(os.environ["srcdir"] + "/test/data",
"bitcoin-util-test.json")

View File

@ -0,0 +1,9 @@
[
{ "exec": ["./bitcoin-tx", "-create"],
"output_cmp": "blanktx.hex"
},
{ "exec": ["./bitcoin-tx", "-"],
"input": "blanktx.hex",
"output_cmp": "blanktx.hex"
}
]

View File

@ -0,0 +1 @@
01000000000000000000