diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-06 13:36:20 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 4b1789f7e96c19a516c1068a9d1b019262cb5741 (patch) | |
| tree | a1dbfb97af185eea996ede82f59eb58a1cc51841 /dex | |
| parent | af2d4af8f03af72683ba23963b0c432effe7feb6 (diff) | |
| download | dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.gz dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.bz2 dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.lz dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.xz dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.tar.zst dexon-4b1789f7e96c19a516c1068a9d1b019262cb5741.zip | |
vendor: sync to latest core and fix conflict (#79)
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/backend.go | 3 |
1 files changed, 1 insertions, 2 deletions
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 } |