From: shenao78 <shenao.78@163.com>
Date: Mon, 28 Oct 2019 04:46:33 +0000 (+0800)
Subject: fix ci
X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=6fae6bc4c06fd2b309b9fd1108991f6aa0c75f34

fix ci
---

diff --git a/application/mov/database/mov_store_test.go b/application/mov/database/mov_store_test.go
index b5875cec..5c1bad0d 100644
--- a/application/mov/database/mov_store_test.go
+++ b/application/mov/database/mov_store_test.go
@@ -1535,9 +1535,9 @@ func TestMovStore(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
@@ -1969,9 +1969,9 @@ func TestListOrders(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
@@ -2382,9 +2382,9 @@ func TestAddOrders(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
@@ -2722,9 +2722,9 @@ func TestDelOrders(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
@@ -2816,9 +2816,9 @@ func TestListTradePairsWithStart(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
@@ -2923,9 +2923,9 @@ func TestUpdateTradePairs(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
@@ -2995,9 +2995,9 @@ func TestCheckMovDatabaseState(t *testing.T) {
 	defer os.RemoveAll("temp")
 	for i, c := range cases {
 		testDB := dbm.NewDB("testdb", "leveldb", "temp")
-		movStore, err := NewLevelDBMovStore(testDB, height, &hash)
-		if err != nil {
-			t.Fatalf("case %d: NewMovStore error %v.", i, err)
+		movStore := NewLevelDBMovStore(testDB)
+		if err := movStore.InitDBState(height, &hash); err != nil {
+			t.Fatalf("case %d: InitDBState error %v.", i, err)
 		}
 
 		batch := movStore.db.NewBatch()
diff --git a/application/mov/mov_core.go b/application/mov/mov_core.go
index 8a9499e6..0daec76f 100644
--- a/application/mov/mov_core.go
+++ b/application/mov/mov_core.go
@@ -152,10 +152,6 @@ func validateMagneticContractArgs(inputAmount uint64, program []byte) error {
 // ApplyBlock parse pending order and cancel from the the transactions of block
 // and add pending order to the dex db, remove cancel order from dex db.
 func (m *MovCore) ApplyBlock(block *types.Block) error {
-	if block.Height <= m.startHeight {
-		return nil
-	}
-
 	if err := m.validateMatchedTxSequence(block.Transactions); err != nil {
 		return err
 	}
@@ -248,10 +244,6 @@ func getSortedTradePairsFromMatchedTx(tx *types.Tx) ([]*common.TradePair, error)
 // DetachBlock parse pending order and cancel from the the transactions of block
 // and add cancel order to the dex db, remove pending order from dex db.
 func (m *MovCore) DetachBlock(block *types.Block) error {
-	if block.Height <= m.startHeight {
-		return nil
-	}
-
 	deleteOrders, addOrders, err := applyTransactions(block.Transactions)
 	if err != nil {
 		return err