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 21:32:54 +0800 |
| commit | 3975b325ecd8d489f6a2c8cd80d4a2d460f49286 (patch) | |
| tree | 44c8015217b4b7c7c4b22bfa56c185c12467a0c1 /dex | |
| parent | 17baa4a7dc4e8d52bbaf276f2ffa74aa9b77a9b8 (diff) | |
| download | go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.tar go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.tar.gz go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.tar.bz2 go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.tar.lz go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.tar.xz go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.tar.zst go-tangerine-3975b325ecd8d489f6a2c8cd80d4a2d460f49286.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 } |