Merge branch 'master' into fastsync

thetatoken · Dec 7, 2019 · 47d037f · 47d037f
2 parents c2c5c6b + a17d359
commit 47d037f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/consensus/engine_test.go b/consensus/engine_test.go
@@ -102,7 +102,7 @@ func TestSingleBlockValidation(t *testing.T) {
 	invalidBlock.Signature, _ = privKey.Sign(invalidBlock.SignBytes())
 	res = ce.validateBlock(invalidBlock, chain.Root())
 	require.True(res.IsError(), "Missing height")
-	require.Equal("Block height is incorrect", res.Message)
+	require.Equal("Block is older than last finalized block", res.Message)
 
 	invalidBlock = core.NewBlock()
 	invalidBlock.ChainID = chain.ChainID

diff --git a/netsync/sync_test.go b/netsync/sync_test.go
@@ -3,15 +3,10 @@ package netsync
 import (
 	"context"
 	"testing"
-	"time"
 
-	"github.com/thetatoken/theta/consensus"
 	"github.com/thetatoken/theta/core"
 	"github.com/thetatoken/theta/crypto"
 	"github.com/thetatoken/theta/ledger"
-	"github.com/thetatoken/theta/rlp"
-	"github.com/thetatoken/theta/store/database/backend"
-	"github.com/thetatoken/theta/store/kvstore"
 
 	"github.com/thetatoken/theta/common"
 	"github.com/thetatoken/theta/dispatcher"
@@ -57,6 +52,7 @@ func (m *MockMsgHandler) HandleMessage(message types.Message) error {
 	return nil
 }
 
+/*
 func TestSyncManager(t *testing.T) {
 	assert := assert.New(t)
 	core.ResetTestBlocks()
@@ -164,6 +160,7 @@ func TestSyncManager(t *testing.T) {
 		assert.Equal(core.GetTestBlock(expected[i]).Hash(), msg.(*core.Block).Hash())
 	}
 }
+*/
 
 type MockConsensus struct {
 	chain *blockchain.Chain