fix functional tests

diff --git a/Makefile b/Makefile
index c031de0..da282ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,8 +112,8 @@ benchmark:
        go test -bench $(PACKAGES)
 
 functional-tests:
-       @go test -v -timeout=30m -tags=functional ./test
+       @go test -v -timeout=5m -tags=functional ./test
 
-ci: test
+ci: test functional-tests
 
 .PHONY: all target release-all clean test benchmark

diff --git a/test/block_test_util.go b/test/block_test_util.go
index 9feaf85..94088f1 100644 (file)
--- a/test/block_test_util.go
+++ b/test/block_test_util.go
@@ -1,8 +1,6 @@
 package test
 
 import (
-       "github.com/bytom/consensus"
-       "github.com/bytom/consensus/difficulty"
        "github.com/bytom/mining/tensority"
        "github.com/bytom/protocol"
        "github.com/bytom/protocol/bc"
@@ -20,9 +18,10 @@ func NewBlock(chain *protocol.Chain, txs []*types.Tx, controlProgram []byte) (*t
        txStatus.SetStatus(0, false)
 
        preBlockHeader := chain.BestBlockHeader()
-       var compareDiffBH *types.BlockHeader
-       if compareDiffBlock, err := chain.GetBlockByHeight(preBlockHeader.Height - consensus.BlocksPerRetarget); err == nil {
-               compareDiffBH = &compareDiffBlock.BlockHeader
+       preBlockHash := preBlockHeader.Hash()
+       nextBits, err := chain.CalcNextBits(&preBlockHash)
+       if err != nil {
+               return nil, err
        }
 
        b := &types.Block{
@@ -32,7 +31,7 @@ func NewBlock(chain *protocol.Chain, txs []*types.Tx, controlProgram []byte) (*t
                        PreviousBlockHash: preBlockHeader.Hash(),
                        Timestamp:         preBlockHeader.Timestamp + 1,
                        BlockCommitment:   types.BlockCommitment{},
-                       Bits:              difficulty.CalcNextRequiredDifficulty(preBlockHeader, compareDiffBH),
+                       Bits:              nextBits,
                },
                Transactions: []*types.Tx{nil},
        }

diff --git a/test/protocol_test.go b/test/protocol_test.go
index 7029e8a..b6f5a47 100644 (file)
--- a/test/protocol_test.go
+++ b/test/protocol_test.go
@@ -8,6 +8,7 @@ import (
 
        dbm "github.com/tendermint/tmlibs/db"
 
+       "github.com/bytom/consensus"
        "github.com/bytom/protocol/bc/types"
        "github.com/bytom/protocol/vm"
 )
@@ -107,7 +108,7 @@ func TestDoubleSpentInDiffBlock(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       if err := AppendBlocks(chain, 6); err != nil {
+       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 
@@ -149,7 +150,7 @@ func TestDoubleSpentInSameBlock(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       if err := AppendBlocks(chain, 7); err != nil {
+       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 
@@ -202,7 +203,7 @@ func TestTxPoolDependencyTx(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       if err := AppendBlocks(chain, 7); err != nil {
+       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 
@@ -257,7 +258,7 @@ func TestAddInvalidTxToTxPool(t *testing.T) {
                t.Fatal(err)
        }
 
-       if err := AppendBlocks(chain, 7); err != nil {
+       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 

diff --git a/test/testdata/chain_tests/ct_dependency_tx.json b/test/testdata/chain_tests/ct_dependency_tx.json
index d756e85..c25e24a 100644 (file)
--- a/test/testdata/chain_tests/ct_dependency_tx.json
+++ b/test/testdata/chain_tests/ct_dependency_tx.json
@@ -1,7 +1,7 @@
 {
   "blocks": [
     {
-      "append": 6
+      "append": 100
     },
     {
       "transactions": [
@@ -28,14 +28,14 @@
       "transactions": [
         {
           "inputs": [
-            {"height": 8, "tx_index": 1, "output_index": 0},
+            {"height": 102, "tx_index": 1, "output_index": 0},
             {"height": 3, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 11, "tx_index": 1, "output_index": 0},
+            {"height": 105, "tx_index": 1, "output_index": 0},
             {"height": 4, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
@@ -46,24 +46,24 @@
       "transactions": [
         {
           "inputs": [
-            {"height": 12, "tx_index": 1, "output_index": 0},
-            {"height": 12, "tx_index": 2, "output_index": 0},
-            {"height": 12, "tx_index": 2, "output_index": 2}
+            {"height": 106, "tx_index": 1, "output_index": 0},
+            {"height": 106, "tx_index": 2, "output_index": 0},
+            {"height": 106, "tx_index": 2, "output_index": 2}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 13, "tx_index": 1, "output_index": 0},
-            {"height": 13, "tx_index": 1, "output_index": 2},
+            {"height": 107, "tx_index": 1, "output_index": 0},
+            {"height": 107, "tx_index": 1, "output_index": 2},
             {"height": 5, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 13, "tx_index": 2, "output_index": 0},
-            {"height": 13, "tx_index": 1, "output_index": 1},
+            {"height": 107, "tx_index": 2, "output_index": 0},
+            {"height": 107, "tx_index": 1, "output_index": 1},
             {"height": 6, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]

diff --git a/test/testdata/chain_tests/ct_double_spend.json b/test/testdata/chain_tests/ct_double_spend.json
index 4bcc29e..b835a1e 100644 (file)
--- a/test/testdata/chain_tests/ct_double_spend.json
+++ b/test/testdata/chain_tests/ct_double_spend.json
@@ -1,7 +1,7 @@
 {
   "blocks": [
     {
-      "append": 6
+      "append": 100
     },
     {
       "transactions": [
@@ -24,7 +24,7 @@
         },
            {
           "inputs": [
-            {"height": 8, "tx_index": 1, "output_index": 0},
+            {"height": 105, "tx_index": 1, "output_index": 0},
             {"height": 3, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
@@ -35,7 +35,7 @@
       "transactions": [
         {
           "inputs": [
-            {"height": 8, "tx_index": 1, "output_index": 0},
+            {"height": 105, "tx_index": 1, "output_index": 0},
             {"height": 4, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]

diff --git a/test/testdata/chain_tests/ct_normal.json b/test/testdata/chain_tests/ct_normal.json
index 282bc25..272db05 100644 (file)
--- a/test/testdata/chain_tests/ct_normal.json
+++ b/test/testdata/chain_tests/ct_normal.json
@@ -1,7 +1,7 @@
 {
   "blocks": [
     {
-      "append": 6
+      "append": 100
     },
     {
       "transactions": [
@@ -28,14 +28,14 @@
       "transactions": [
         {
           "inputs": [
-            {"height": 8, "tx_index": 1, "output_index": 0},
+            {"height": 105, "tx_index": 1, "output_index": 0},
             {"height": 3, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 11, "tx_index": 1, "output_index": 0},
+            {"height": 105, "tx_index": 1, "output_index": 2},
             {"height": 4, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]

diff --git a/test/testdata/chain_tests/ct_rollback.json b/test/testdata/chain_tests/ct_rollback.json
index cb77552..f3178d0 100644 (file)
--- a/test/testdata/chain_tests/ct_rollback.json
+++ b/test/testdata/chain_tests/ct_rollback.json
@@ -1,8 +1,8 @@
 {
-  "rollback_to": 10,
+  "rollback": 104,
   "blocks": [
     {
-      "append": 6
+      "append": 100
     },
     {
       "transactions": [
@@ -29,14 +29,14 @@
       "transactions": [
         {
           "inputs": [
-            {"height": 8, "tx_index": 1, "output_index": 0},
+            {"height": 102, "tx_index": 1, "output_index": 0},
             {"height": 3, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 11, "tx_index": 1, "output_index": 0},
+            {"height": 105, "tx_index": 1, "output_index": 0},
             {"height": 4, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
@@ -47,24 +47,24 @@
       "transactions": [
         {
           "inputs": [
-            {"height": 12, "tx_index": 1, "output_index": 0},
-            {"height": 12, "tx_index": 2, "output_index": 0},
-            {"height": 12, "tx_index": 2, "output_index": 2}
+            {"height": 106, "tx_index": 1, "output_index": 0},
+            {"height": 106, "tx_index": 2, "output_index": 0},
+            {"height": 106, "tx_index": 2, "output_index": 2}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 13, "tx_index": 1, "output_index": 0},
-            {"height": 13, "tx_index": 1, "output_index": 2},
+            {"height": 107, "tx_index": 1, "output_index": 0},
+            {"height": 107, "tx_index": 1, "output_index": 2},
             {"height": 5, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]
         },
         {
           "inputs": [
-            {"height": 13, "tx_index": 2, "output_index": 0},
-            {"height": 13, "tx_index": 1, "output_index": 1},
+            {"height": 107, "tx_index": 2, "output_index": 0},
+            {"height": 107, "tx_index": 1, "output_index": 1},
             {"height": 6, "tx_index": 0, "output_index": 0}
           ],
           "outputs": [3000000000, 10000000, 3000000000]

diff --git a/test/testdata/wallet_tests/wt_asset.json b/test/testdata/wallet_tests/wt_asset.json
index 5024a8b..ea76614 100644 (file)
--- a/test/testdata/wallet_tests/wt_asset.json
+++ b/test/testdata/wallet_tests/wt_asset.json
@@ -1,11 +1,13 @@
 {
   "keys": [
     {"name": "alice", "password": "alice"},
-    {"name": "bob", "password": "bob"}
+    {"name": "bob", "password": "bob"},
+    {"name": "none", "password": "none"}
   ],
   "accounts": [
     {"name": "alice", "keys": ["alice"], "quorum": 1},
-    {"name": "bob", "keys": ["bob"], "quorum": 1}
+    {"name": "bob", "keys": ["bob"], "quorum": 1},
+    {"name": "none", "keys": ["none"], "quorum": 1}
   ],
   "blocks": [
     {
@@ -13,10 +15,10 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 41250000000}
       ],
-      "append": 6
+      "append": 100
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
@@ -24,19 +26,20 @@
             {"type": "spend_account", "name": "alice", "amount": 6000000000, "asset": "BTM"}
           ],
           "outputs": [
-            {"type": "output", "name": "bob", "amount": 1000000000, "asset": "BTM"},
-            {"type": "output", "name": "alice", "amount": 4000000000, "asset": "BTM"}
+            {"type": "output", "name": "bob", "amount": 500000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 500000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"}
           ]
         }
       ],
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 39250000000},
-        {"name": "bob", "asset": "BTM", "amount": 43250000000}
-      ],
-      "append": 6
+        {"name": "bob", "asset": "BTM", "amount": 1000000000}
+      ]
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
@@ -52,42 +55,40 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 38250000000},
         {"name": "alice", "asset": "GOLD", "amount": 100},
-        {"name": "bob", "asset": "BTM", "amount": 85500000000}
-      ],
-      "append": 6
+        {"name": "bob", "asset": "BTM", "amount": 1000000000}
+      ]
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["bob"],
           "inputs": [
-            {"type": "spend_account", "name": "bob", "amount": 6000000000, "asset": "BTM"}
+            {"type": "spend_account", "name": "bob", "amount": 400000000, "asset": "BTM"}
           ],
           "outputs": [
-            {"type": "output", "name": "alice", "amount": 1000000000, "asset": "BTM"},
-            {"type": "output", "name": "bob", "amount": 4000000000, "asset": "BTM"}
+            {"type": "output", "name": "alice", "amount": 100000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 200000000, "asset": "BTM"}
           ]
         },
         {
           "passwords": ["alice", "bob"],
           "inputs": [
-            {"type": "spend_account", "name": "bob", "amount": 2000000000, "asset": "BTM"},
+            {"type": "spend_account", "name": "bob", "amount": 200000000, "asset": "BTM"},
             {"type": "spend_account", "name": "alice", "amount": 50, "asset": "GOLD"}
           ],
           "outputs": [
             {"type": "output", "name": "bob", "amount": 50, "asset": "GOLD"},
-            {"type": "output", "name": "alice", "amount": 1000000000, "asset": "BTM"}
+            {"type": "output", "name": "alice", "amount": 100000000, "asset": "BTM"}
           ]
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 40250000000},
+        {"name": "alice", "asset": "BTM", "amount": 38450000000},
         {"name": "alice", "asset": "GOLD", "amount": 50},
-        {"name": "bob", "asset": "BTM", "amount": 124750000000},
+        {"name": "bob", "asset": "BTM", "amount": 600000000},
         {"name": "bob", "asset": "GOLD", "amount": 50}
-      ],
-      "append": 0
+      ]
     }
   ]
 }

diff --git a/test/testdata/wallet_tests/wt_btm.json b/test/testdata/wallet_tests/wt_btm.json
index 1299445..9acaea3 100644 (file)
--- a/test/testdata/wallet_tests/wt_btm.json
+++ b/test/testdata/wallet_tests/wt_btm.json
@@ -13,7 +13,7 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 41250000000}
       ],
-      "append": 6
+      "append": 100
     },
     {
       "coinbase_account": "bob",

diff --git a/test/testdata/wallet_tests/wt_invalid_txs.json b/test/testdata/wallet_tests/wt_invalid_txs.json
index 3d35b91..5a68715 100644 (file)
--- a/test/testdata/wallet_tests/wt_invalid_txs.json
+++ b/test/testdata/wallet_tests/wt_invalid_txs.json
@@ -15,7 +15,7 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 41250000000}
       ],
-      "append": 6
+      "append": 100
     },
     {
       "coinbase_account": "bob",

diff --git a/test/testdata/wallet_tests/wt_multi_sig_asset.json b/test/testdata/wallet_tests/wt_multi_sig_asset.json
index 6b8a18d..fbbaed9 100644 (file)
--- a/test/testdata/wallet_tests/wt_multi_sig_asset.json
+++ b/test/testdata/wallet_tests/wt_multi_sig_asset.json
@@ -1,12 +1,14 @@
 {
   "keys": [
     {"name": "alice", "password": "alice"},
-    {"name": "bob", "password": "bob"}
+    {"name": "bob", "password": "bob"},
+    {"name": "none", "password": "none"}
   ],
   "accounts": [
     {"name": "alice", "keys": ["alice"], "quorum": 1},
     {"name": "bob", "keys": ["bob"], "quorum": 1},
-    {"name": "multi-sig", "keys": ["alice", "bob"], "quorum": 2}
+    {"name": "multi-sig", "keys": ["alice", "bob"], "quorum": 2},
+    {"name": "none", "keys": ["none"], "quorum": 1}
   ],
   "blocks": [
     {
@@ -14,31 +16,37 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 41250000000}
       ],
-      "append": 6
+      "append": 100
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
           "inputs": [
-            {"type": "spend_account", "name": "alice", "amount": 10000000000, "asset": "BTM"}
+            {"type": "spend_account", "name": "alice", "amount": 40000000000, "asset": "BTM"}
           ],
           "outputs": [
-            {"type": "output", "name": "bob", "amount": 4000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"},
+            {"type": "output", "name": "multi-sig", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "multi-sig", "amount": 5000000000, "asset": "BTM"},
             {"type": "output", "name": "multi-sig", "amount": 5000000000, "asset": "BTM"}
           ]
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 31250000000},
-        {"name": "bob", "asset": "BTM", "amount": 46250000000},
-        {"name": "multi-sig", "asset": "BTM", "amount": 5000000000}
-      ],
-      "append": 6
+        {"name": "alice", "asset": "BTM", "amount": 10250000000},
+        {"name": "bob", "asset": "BTM", "amount": 15000000000},
+        {"name": "multi-sig", "asset": "BTM", "amount": 15000000000}
+      ]
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["bob", "alice"],
@@ -52,15 +60,14 @@
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 31250000000},
+        {"name": "alice", "asset": "BTM", "amount": 10250000000},
         {"name": "multi-sig", "asset": "GOLD", "amount": 100},
-        {"name": "multi-sig", "asset": "BTM", "amount": 4000000000},
-        {"name": "bob", "asset": "BTM", "amount": 88500000000}
-      ],
-      "append": 6
+        {"name": "multi-sig", "asset": "BTM", "amount": 14000000000},
+        {"name": "bob", "asset": "BTM", "amount": 15000000000}
+      ]
     },
     {
-      "coinbase_account": "multi-sig",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice", "bob"],
@@ -78,14 +85,13 @@
         }
       ],
       "post_states": [
-        {"name": "multi-sig", "asset": "BTM", "amount": 65250000000},
+        {"name": "multi-sig", "asset": "BTM", "amount": 33000000000},
         {"name": "multi-sig", "asset": "GOLD", "amount": 60},
-        {"name": "alice", "asset": "BTM", "amount": 21250000000},
+        {"name": "alice", "asset": "BTM", "amount": 250000000},
         {"name": "alice", "asset": "GOLD", "amount": 20},
-        {"name": "bob", "asset": "BTM", "amount": 78500000000},
+        {"name": "bob", "asset": "BTM", "amount": 5000000000},
         {"name": "bob", "asset": "GOLD", "amount": 20}
-      ],
-      "append": 0
+      ]
     }
   ]
 }

diff --git a/test/testdata/wallet_tests/wt_retire_asset.json b/test/testdata/wallet_tests/wt_retire_asset.json
index 4eb5b7b..49fab7d 100644 (file)
--- a/test/testdata/wallet_tests/wt_retire_asset.json
+++ b/test/testdata/wallet_tests/wt_retire_asset.json
@@ -1,11 +1,13 @@
 {
   "keys": [
     {"name": "alice", "password": "alice"},
-    {"name": "bob", "password": "bob"}
+    {"name": "bob", "password": "bob"},
+    {"name": "none", "password": "none"}
   ],
   "accounts": [
     {"name": "alice", "keys": ["alice"], "quorum": 1},
-    {"name": "bob", "keys": ["bob"], "quorum": 1}
+    {"name": "bob", "keys": ["bob"], "quorum": 1},
+    {"name": "none", "keys": ["none"], "quorum": 1}
   ],
   "blocks": [
     {
@@ -13,30 +15,34 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 41250000000}
       ],
-      "append": 6
+      "append": 100
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
           "inputs": [
-            {"type": "spend_account", "name": "alice", "amount": 6000000000, "asset": "BTM"}
+            {"type": "spend_account", "name": "alice", "amount": 30000000000, "asset": "BTM"}
           ],
           "outputs": [
-            {"type": "output", "name": "bob", "amount": 1000000000, "asset": "BTM"},
-            {"type": "output", "name": "alice", "amount": 4000000000, "asset": "BTM"}
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"}
           ]
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 39250000000},
-        {"name": "bob", "asset": "BTM", "amount": 43250000000}
-      ],
-      "append": 6
+        {"name": "alice", "asset": "BTM", "amount": 25250000000},
+        {"name": "bob", "asset": "BTM", "amount": 15000000000}
+      ]
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
@@ -50,23 +56,22 @@
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 38250000000},
+        {"name": "alice", "asset": "BTM", "amount": 24250000000},
         {"name": "alice", "asset": "GOLD", "amount": 100},
-        {"name": "bob", "asset": "BTM", "amount": 85500000000}
-      ],
-      "append": 6
+        {"name": "bob", "asset": "BTM", "amount": 15000000000}
+      ]
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["bob"],
           "inputs": [
-            {"type": "spend_account", "name": "bob", "amount": 6000000000, "asset": "BTM"}
+            {"type": "spend_account", "name": "bob", "amount": 5000000000, "asset": "BTM"}
           ],
           "outputs": [
             {"type": "output", "name": "alice", "amount": 1000000000, "asset": "BTM"},
-            {"type": "output", "name": "bob", "amount": 4000000000, "asset": "BTM"}
+            {"type": "output", "name": "bob", "amount": 3000000000, "asset": "BTM"}
           ]
         },
         {
@@ -82,15 +87,14 @@
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 40250000000},
+        {"name": "alice", "asset": "BTM", "amount": 26250000000},
         {"name": "alice", "asset": "GOLD", "amount": 50},
-        {"name": "bob", "asset": "BTM", "amount": 124750000000},
+        {"name": "bob", "asset": "BTM", "amount": 11000000000},
         {"name": "bob", "asset": "GOLD", "amount": 50}
-      ],
-      "append": 0
+      ]
     },
     {
-      "coinbase_account": "alice",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
@@ -104,12 +108,11 @@
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 81500000000},
+        {"name": "alice", "asset": "BTM", "amount": 25250000000},
         {"name": "alice", "asset": "GOLD", "amount": 30},
-        {"name": "bob", "asset": "BTM", "amount": 124750000000},
+        {"name": "bob", "asset": "BTM", "amount": 11000000000},
         {"name": "bob", "asset": "GOLD", "amount": 50}
-      ],
-      "append": 0
+      ]
     }
   ]
 }

diff --git a/test/testdata/wallet_tests/wt_rollback.json b/test/testdata/wallet_tests/wt_rollback.json
index 2f72d34..dbbcfaf 100644 (file)
--- a/test/testdata/wallet_tests/wt_rollback.json
+++ b/test/testdata/wallet_tests/wt_rollback.json
@@ -1,13 +1,15 @@
 {
-  "rollback_to": 20,
+  "rollback": 102,
   "keys": [
     {"name": "alice", "password": "alice"},
-    {"name": "bob", "password": "bob"}
+    {"name": "bob", "password": "bob"},
+    {"name": "none", "password": "none"}
   ],
   "accounts": [
     {"name": "alice", "keys": ["alice"], "quorum": 1},
     {"name": "bob", "keys": ["bob"], "quorum": 1},
-    {"name": "multi-sig", "keys": ["alice", "bob"], "quorum": 2}
+    {"name": "multi-sig", "keys": ["alice", "bob"], "quorum": 2},
+    {"name": "none", "keys": ["none"], "quorum": 1}
   ],
   "blocks": [
     {
@@ -15,31 +17,37 @@
       "post_states": [
         {"name": "alice", "asset": "BTM", "amount": 41250000000}
       ],
-      "append": 6
+      "append": 100
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice"],
           "inputs": [
-            {"type": "spend_account", "name": "alice", "amount": 10000000000, "asset": "BTM"}
+            {"type": "spend_account", "name": "alice", "amount": 40000000000, "asset": "BTM"}
           ],
           "outputs": [
-            {"type": "output", "name": "bob", "amount": 4000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "bob", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"},
+            {"type": "output", "name": "alice", "amount": 2000000000, "asset": "BTM"},
+            {"type": "output", "name": "multi-sig", "amount": 5000000000, "asset": "BTM"},
+            {"type": "output", "name": "multi-sig", "amount": 5000000000, "asset": "BTM"},
             {"type": "output", "name": "multi-sig", "amount": 5000000000, "asset": "BTM"}
           ]
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 31250000000},
-        {"name": "bob", "asset": "BTM", "amount": 46250000000},
-        {"name": "multi-sig", "asset": "BTM", "amount": 5000000000}
-      ],
-      "append": 6
+        {"name": "alice", "asset": "BTM", "amount": 10250000000},
+        {"name": "bob", "asset": "BTM", "amount": 15000000000},
+        {"name": "multi-sig", "asset": "BTM", "amount": 15000000000}
+      ]
     },
     {
-      "coinbase_account": "bob",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["bob", "alice"],
@@ -53,15 +61,14 @@
         }
       ],
       "post_states": [
-        {"name": "alice", "asset": "BTM", "amount": 31250000000},
+        {"name": "alice", "asset": "BTM", "amount": 10250000000},
         {"name": "multi-sig", "asset": "GOLD", "amount": 100},
-        {"name": "multi-sig", "asset": "BTM", "amount": 4000000000},
-        {"name": "bob", "asset": "BTM", "amount": 88500000000}
-      ],
-      "append": 6
+        {"name": "multi-sig", "asset": "BTM", "amount": 14000000000},
+        {"name": "bob", "asset": "BTM", "amount": 15000000000}
+      ]
     },
     {
-      "coinbase_account": "multi-sig",
+      "coinbase_account": "none",
       "transactions": [
         {
           "passwords": ["alice", "bob"],
@@ -79,14 +86,13 @@
         }
       ],
       "post_states": [
-        {"name": "multi-sig", "asset": "BTM", "amount": 65250000000},
+        {"name": "multi-sig", "asset": "BTM", "amount": 33000000000},
         {"name": "multi-sig", "asset": "GOLD", "amount": 60},
-        {"name": "alice", "asset": "BTM", "amount": 21250000000},
+        {"name": "alice", "asset": "BTM", "amount": 250000000},
         {"name": "alice", "asset": "GOLD", "amount": 20},
-        {"name": "bob", "asset": "BTM", "amount": 78500000000},
+        {"name": "bob", "asset": "BTM", "amount": 5000000000},
         {"name": "bob", "asset": "GOLD", "amount": 20}
-      ],
-      "append": 0
+      ]
     }
   ]
 }