Jimmy Kiselak
e08d765f11
Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge
...
Conflicts:
Makefile.am
README.md
configure.ac
contrib/seeds/nodes_main.txt
qa/rpc-tests/decodescript.py
qa/rpc-tests/test_framework/util.py
src/Makefile.am
src/Makefile.qt.include
src/Makefile.qttest.include
src/Makefile.test.include
src/bitcoin-cli-res.rc
src/bitcoin-cli.cpp
src/bitcoin-tx.cpp
src/bitcoind.cpp
src/chainparams.cpp
src/chainparamsseeds.h
src/init.cpp
src/main.cpp
src/main.h
src/miner.cpp
src/net.cpp
src/primitives/block.cpp
src/rpc/mining.cpp
src/rpc/rawtransaction.cpp
src/rpc/server.cpp
src/rpcserver.h
src/script/interpreter.cpp
src/script/script.cpp
src/script/script.h
src/test/alert_tests.cpp
src/test/data/alertTests.raw
src/test/data/script_invalid.json
src/test/data/script_valid.json
src/test/data/tx_invalid.json
src/test/data/tx_valid.json
src/test/miner_tests.cpp
src/test/script_tests.cpp
src/test/test_bitcoin.cpp
src/test/test_bitcoin.h
src/test/transaction_tests.cpp
src/timedata.cpp
src/util.cpp
src/wallet/rpcwallet.cpp
src/wallet/wallet.cpp
src/wallet/wallet.h
2016-05-15 22:16:56 -04:00
Wladimir J. van der Laan
b1bf511af6
Merge #7833 : tests: Check Content-Type header returned from RPC server
...
5078ca4
tests: Check Content-Type header returned from RPC server (Wladimir J. van der Laan)
2016-04-18 12:45:04 +02:00
João Barbosa
af4fe7fd12
Add change options to fundrawtransaction
2016-04-15 15:36:05 +02:00
Wladimir J. van der Laan
6ef5e000a2
Merge #7853 : [qa] py2: Unfiddle strings into bytes explicitly
...
faa41ee
[qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke)
2016-04-14 17:40:31 +02:00
Rusty Russell
d12760b16a
rpc-tests: handle KeyError nicely in test_framework.py
...
btcdrak wrote this for me.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2016-04-13 16:54:07 +09:30
Rusty Russell
85c807c9ea
getblockchaininfo: make bip9_softforks an object, not an array.
...
We can't change "softforks", but it seems far more logical to use tags
in an object rather than using an "id" field in an array.
For example, to get the csv status before, you need to iterate the
array to find the entry with 'id' field equal to "csv":
jq '.bip9_softforks | map(select(.id == "csv"))[] | .status'
Now:
jq '.bip9_softforks.csv.status'
There is no issue with fork names being incompatible with JSON tags,
since we're selecting them ourselves.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2016-04-13 16:53:52 +09:30
MarcoFalke
faa41ee204
[qa] py2: Unfiddle strings into bytes explicitly
2016-04-10 20:35:57 +02:00
Suhas Daftuar
da5fdbb3a2
Test relay of version 2 transactions
2016-04-07 14:59:50 -04:00
Suhas Daftuar
5cb1d8a207
Tests: move get_bip9_status to util.py
2016-04-07 14:54:50 -04:00
Wladimir J. van der Laan
5078ca4543
tests: Check Content-Type header returned from RPC server
...
Check the Content-Type header that is returned from the RPC server. Only
if it is `application/json` the data is supposed to be parsed as JSON.
This gives better reporting if the HTTP server happens to return an error that is
not JSON-formatted, which is the case if it happens at a lower level
before JSON-RPC kicks in.
Before: `Unexpected exception caught during testing: No JSON object could be decoded`
After: `JSONRPC error: non-JSON HTTP response with '403 Forbidden' from server`
2016-04-07 15:40:17 +02:00
Wladimir J. van der Laan
3bc71e1572
Merge #7802 : [qa] httpbasics: Actually test second connection
...
fa24456
[qa] httpbasics: Actually test second connection (MarcoFalke)
2016-04-06 14:14:14 +02:00
Wladimir J. van der Laan
401c65c6b3
Merge #7803 : [qa] maxblocksinflight: Actually enable test
...
fac724c
[qa] maxblocksinflight: Actually enable test (MarcoFalke)
2016-04-06 14:13:38 +02:00
Wladimir J. van der Laan
70ac71b877
Merge #7801 : [qa] Remove misleading "errorString syntax"
...
ffff866
[qa] Remove misleading "errorString syntax" (MarcoFalke)
2016-04-06 14:12:44 +02:00
mruddy
92107d574d
RPC: add versionHex in getblock and getblockheader JSON results; expand data in getblockchaininfo bip9_softforks field.
2016-04-04 22:21:00 +00:00
MarcoFalke
ffff866da8
[qa] Remove misleading "errorString syntax"
2016-04-03 21:33:56 +02:00
MarcoFalke
fac724c78f
[qa] maxblocksinflight: Actually enable test
2016-04-03 20:49:32 +02:00
MarcoFalke
fa24456d0c
[qa] httpbasics: Actually test second connection
2016-04-03 20:43:56 +02:00
Wladimir J. van der Laan
ff5874bcf7
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)
2016-04-03 15:54:35 +02:00
MarcoFalke
444480649f
[qa] mininode: Combine struct.pack format strings
2016-04-02 11:48:07 +02:00
MarcoFalke
faaa3c9b65
[qa] mininode: Catch exceptions in got_data
2016-04-01 21:23:49 +02:00
MarcoFalke
fa2cea163b
[qa] rpc-tests: Properly use integers, floats
2016-04-01 21:23:30 +02:00
Wladimir J. van der Laan
e9723cb273
Merge #7489 : tests: Make proxy_test work on travis servers without IPv6
...
7539f1a
tests: Make proxy_test work on travis servers without IPv6 (Wladimir J. van der Laan)
2016-04-01 14:42:26 +02:00
MarcoFalke
fa524d9ddb
[qa] Use python2/3 syntax
2016-03-31 18:35:17 +02:00
BtcDrak
40234ba89f
Fix comments in tests
2016-03-30 19:38:02 +01:00
Wladimir J. van der Laan
e8a8f3d4b2
Merge #7648 : BIP9 versionbits softfork for BIP68, BIP112 and BIP113
...
71527a0
Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier)
19d73d5
Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos)
12c89c9
Policy: allow transaction version 2 relay policy. (BtcDrak)
02c2435
Soft fork logic for BIP68 (BtcDrak)
478fba6
Soft fork logic for BIP113 (BtcDrak)
65751a3
Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille)
2016-03-30 18:59:39 +02:00
Wladimir J. van der Laan
d8e862a5a7
Merge #7744 : test_framework: detect failure of bitcoind startup
...
018b60c
test_framework: detect failure of bitcoind startup (Wladimir J. van der Laan)
2016-03-29 17:16:30 +02:00
MarcoFalke
faa9f01461
[qa] Don't run pruning.py twice
2016-03-29 16:49:45 +02:00
Wladimir J. van der Laan
b35a591793
Merge #7558 : [RPC] Add import/removeprunedfunds rpc call
...
f1bb13c
Added companion removeprunedfunds call. (instagibbs)
7eb7029
Add importprunedfunds rpc call (instagibbs)
2016-03-29 11:15:02 +02:00
MarcoFalke
fa3fafc960
[qa] wallet: Wait for reindex to catch up
2016-03-28 21:47:42 +02:00
Luke Dashjr
e7e48ba66c
test_framework: Py3.4 compat: Specify timeout parameter by name
...
Changed in version 3.4: The strict parameter was removed. HTTP 0.9-style
“Simple Responses” are not longer supported.
(https://docs.python.org/3/library/http.client.html )
Source: 7ebeebb4f6
2016-03-28 12:30:48 +02:00
Wladimir J. van der Laan
d7b80b54fb
test_framework: Avoid infinite loop in encoding Decimal
...
Avoid an infinite loop in encoding, by ensuring EncodeDecimal
returns a string. round(Decimal) used to convert it to
float, but it no longer does in python 3.x. Strings are
supported since #6380 , so just use that.
2016-03-28 12:20:13 +02:00
Wladimir J. van der Laan
018b60c5ea
test_framework: detect failure of bitcoind startup
...
Replace the `bitcoin-cli -rpcwait` after spawning bitcoind
with our own loop that detects when bitcoind exits prematurely.
And if one node fails to start, stop the others.
This prevents a hang in such a case (see #7463 ).
2016-03-26 08:10:07 +01:00
instagibbs
f1bb13c93d
Added companion removeprunedfunds call.
2016-03-23 10:40:38 -04:00
instagibbs
7eb702954e
Add importprunedfunds rpc call
2016-03-23 10:40:38 -04:00
Wladimir J. van der Laan
3bdc583b3f
Merge #7715 : Fix calculation of balances and available coins.
...
68d4282
Fix calculation of balances and available coins. (Alex Morcos)
2016-03-23 15:09:02 +01:00
Wladimir J. van der Laan
e2ebd259fb
Merge #7671 : [RPC] Add generatetoaddress rpc to mine to an address
...
d5c5c71
RPC tests for generatetoaddress (Andrew C)
fe00ca7
Create generatetoaddress rpc (Andrew C)
2016-03-23 13:24:53 +01:00
Alex Morcos
b536a6fc83
Add p2p test for feefilter
2016-03-21 10:46:25 -04:00
Alex Morcos
5fa66e4682
Create SingleNodeConnCB class for RPC tests
2016-03-21 10:46:25 -04:00
Andrew C
d5c5c713e6
RPC tests for generatetoaddress
...
Adds two RPC tests for the generatetoaddress RPC, one in the wallet, and one when the wallet is disabled.
The wallet RPC Test mines Bitcoin to another node's address and checks that that node has received the Bitcoin.
The RPC test without the wallet mines Bitcoin to an arbitrary address and checks that it works. It then mines to an arbitrary invalid address and checks that that fails.
2016-03-21 10:22:29 -04:00
NicolasDorier
71527a0f31
Test of BIP9 fork activation of mtp, csv, sequence_lock
2016-03-21 09:07:34 +00:00
MarcoFalke
fab3890156
[qa] rpc-test: Normalize assert()
2016-03-19 19:07:08 +01:00
Alex Morcos
68d4282774
Fix calculation of balances and available coins.
...
No longer consider coins which aren't in our mempool.
Add test for regression in abandonconflict.py
2016-03-18 09:56:30 -04:00
Wladimir J. van der Laan
29e1131c46
Merge #7702 : [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock
...
fa4a522
[qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke)
2016-03-18 12:23:55 +01:00
Wladimir J. van der Laan
efde86b4aa
Merge #7709 : Tests: fix missing import in mempool_packages
...
e38781d
Tests: fix missing import in mempool_packages (Suhas Daftuar)
2016-03-18 11:09:03 +01:00
Alex Morcos
19d73d540c
Add RPC test for BIP 68/112/113 soft fork.
...
This RPC test will test both the activation mechanism of the first versionbits soft fork as well as testing many code branches of the consensus logic for BIP's 68, 112, and 113.
2016-03-18 08:09:06 +00:00
Wladimir J. van der Laan
73b7eb501e
Merge #7575 : Minimal BIP9 implementation
...
8c74ced
RPC test for BIP9 warning logic (Suhas Daftuar)
7870deb
Test versionbits deployments (Suhas Daftuar)
532cbb2
Add testing of ComputeBlockVersion (Suhas Daftuar)
d23f6c6
Softfork status report in RPC (Pieter Wuille)
732e774
Versionbits tests (Pieter Wuille)
6851107
BIP9 Implementation (Pieter Wuille)
2016-03-18 08:50:43 +01:00
Suhas Daftuar
e38781da40
Tests: fix missing import in mempool_packages
2016-03-17 20:23:29 -04:00
MarcoFalke
fa4a522541
[qa] Add tests verifychain, lockunspent, getbalance, listsinceblock
2016-03-17 11:21:34 +01:00
Suhas Daftuar
ec143391ef
Tests: make prioritise_transaction.py more robust
2016-03-16 12:52:04 -04:00
Wladimir J. van der Laan
3d0dfdbf9f
Merge #7684 : [qa] Extend tests
...
fad8cfb
[qa] mininode: Add and use CONSTs (MarcoFalke)
fa8cd46
[qa] Move create_tx() to util.py (MarcoFalke)
fad7dc8
[qa] wallet: speed up tests (MarcoFalke)
fa3a81a
[tests] Extend util_ParseMoney test case (MarcoFalke)
2016-03-16 17:32:05 +01:00