OSDN Git Service

mov late node sync test (#528)
[bytom/vapor.git] / test / protocol_test.go
index b02a511..e4d87a9 100644 (file)
@@ -6,11 +6,10 @@ import (
        "os"
        "testing"
 
-       dbm "github.com/tendermint/tmlibs/db"
-
-       "github.com/vapor/consensus"
-       "github.com/vapor/protocol/bc/types"
-       "github.com/vapor/protocol/vm"
+       "github.com/bytom/vapor/consensus"
+       dbm "github.com/bytom/vapor/database/leveldb"
+       "github.com/bytom/vapor/protocol/bc/types"
+       "github.com/bytom/vapor/protocol/vm"
 )
 
 // case1:           |------c1(height=7)
@@ -108,7 +107,7 @@ func TestDoubleSpentInDiffBlock(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
+       if err := AppendBlocks(chain, consensus.ActiveNetParams.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 
@@ -123,7 +122,7 @@ func TestDoubleSpentInDiffBlock(t *testing.T) {
        }
 
        newBlock, err := NewBlock(chain, []*types.Tx{tx}, []byte{byte(vm.OP_TRUE)})
-       err = SolveAndUpdate(chain, newBlock)
+       _, err = chain.ProcessBlock(newBlock)
        if err != nil {
                t.Fatal(err)
        }
@@ -149,7 +148,7 @@ func TestDoubleSpentInSameBlock(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
+       if err := AppendBlocks(chain, consensus.ActiveNetParams.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 
@@ -190,7 +189,7 @@ func TestDoubleSpentInSameBlock(t *testing.T) {
                t.Fatal(err)
        }
 
-       if err := SolveAndUpdate(chain, block); err == nil {
+       if _, err := chain.ProcessBlock(block); err == nil {
                t.Fatalf("process double spent tx success")
        }
 }
@@ -202,7 +201,7 @@ func TestTxPoolDependencyTx(t *testing.T) {
        if err != nil {
                t.Fatal(err)
        }
-       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
+       if err := AppendBlocks(chain, consensus.ActiveNetParams.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }
 
@@ -243,7 +242,7 @@ func TestTxPoolDependencyTx(t *testing.T) {
                t.Fatal(err)
        }
 
-       if err := SolveAndUpdate(chain, block); err != nil {
+       if _, err := chain.ProcessBlock(block); err != nil {
                t.Fatal("process dependency tx failed")
        }
 }
@@ -257,7 +256,7 @@ func TestAddInvalidTxToTxPool(t *testing.T) {
                t.Fatal(err)
        }
 
-       if err := AppendBlocks(chain, consensus.CoinbasePendingBlockNumber+1); err != nil {
+       if err := AppendBlocks(chain, consensus.ActiveNetParams.CoinbasePendingBlockNumber+1); err != nil {
                t.Fatal(err)
        }