From 4b1789f7e96c19a516c1068a9d1b019262cb5741 Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Thu, 6 Dec 2018 13:36:20 +0800 Subject: vendor: sync to latest core and fix conflict (#79) --- dex/backend.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dex/backend.go') diff --git a/dex/backend.go b/dex/backend.go index 4e7def8e4..8153dc2ed 100644 --- a/dex/backend.go +++ b/dex/backend.go @@ -23,7 +23,6 @@ import ( dexCore "github.com/dexon-foundation/dexon-consensus/core" coreEcdsa "github.com/dexon-foundation/dexon-consensus/core/crypto/ecdsa" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" "github.com/dexon-foundation/dexon/accounts" "github.com/dexon-foundation/dexon/consensus" @@ -251,7 +250,7 @@ func (s *Dexon) Stop() error { func (s *Dexon) StartProposing() error { // TODO: Run with the latest confirmed block in compaction chain. - s.consensus.Run(&coreTypes.Block{}) + s.consensus.Run() return nil } -- cgit v1.2.3