diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-15 08:56:55 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-15 08:56:55 -0500 |
| commit | 085c62149ad19cecf235829e49df07884a279e1e (patch) | |
| tree | 4106ba96196e883464f5891ef88be34514c67cb9 /qa | |
| parent | 05d3ded072d782036c31c1d773c0441b87de843e (diff) | |
| parent | 731b89b8b53cb2ea4d2d5c8f2875def515766ea1 (diff) | |
Merge pull request #3671 from gavinandresen/txn_conflicts
Report transaction conflicts, and tentative account balance fix
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/txnmall.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/qa/rpc-tests/txnmall.sh b/qa/rpc-tests/txnmall.sh index 7aca5f36df..6bf92fce40 100755 --- a/qa/rpc-tests/txnmall.sh +++ b/qa/rpc-tests/txnmall.sh @@ -88,8 +88,10 @@ B2ADDRESS=$( $CLI $B2ARGS getnewaddress ) # Have B1 create two transactions; second will # spend change from first, since B1 starts with only a single # 50 bitcoin output: -TXID1=$( $CLI $B1ARGS sendtoaddress $B2ADDRESS 1.0 ) -TXID2=$( $CLI $B1ARGS sendtoaddress $B2ADDRESS 2.0 ) +$CLI $B1ARGS move "" "foo" 10.0 +$CLI $B1ARGS move "" "bar" 10.0 +TXID1=$( $CLI $B1ARGS sendfrom foo $B2ADDRESS 1.0 0) +TXID2=$( $CLI $B1ARGS sendfrom bar $B2ADDRESS 2.0 0) # Mutate TXID1 and add it to B2's memory pool: RAWTX1=$( $CLI $B1ARGS getrawtransaction $TXID1 ) @@ -122,7 +124,9 @@ echo "Mutated: " $MUTATEDTXID $CLI $B2ARGS addnode 127.0.0.1:11000 onetry WaitPeers "$B1ARGS" 1 -$CLI $B2ARGS setgenerate true 1 +$CLI $B2ARGS setgenerate true 3 +WaitBlocks +$CLI $B1ARGS setgenerate true 3 WaitBlocks $CLI $B2ARGS stop > /dev/null 2>&1 |