diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-06 13:36:20 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 13:49:59 +0800 |
| commit | 76453ea278c56cc518a075b4bacc72630533f4f1 (patch) | |
| tree | 8a45cd695a46ffe7fe88de5f38311ebe2113d1c7 /dex | |
| parent | 823b938b663b7165080f37fecaa0bbc4b99b3ffc (diff) | |
| download | dexon-76453ea278c56cc518a075b4bacc72630533f4f1.tar dexon-76453ea278c56cc518a075b4bacc72630533f4f1.tar.gz dexon-76453ea278c56cc518a075b4bacc72630533f4f1.tar.bz2 dexon-76453ea278c56cc518a075b4bacc72630533f4f1.tar.lz dexon-76453ea278c56cc518a075b4bacc72630533f4f1.tar.xz dexon-76453ea278c56cc518a075b4bacc72630533f4f1.tar.zst dexon-76453ea278c56cc518a075b4bacc72630533f4f1.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 } |