diff options
| author | Mission Liao <mission.liao@dexon.org> | 2019-02-20 13:54:34 +0800 |
|---|---|---|
| committer | Mission Liao <mission.liao@dexon.org> | 2019-02-22 11:18:08 +0800 |
| commit | d1f906b4db0b2848b75b6b92528a56967edb94ca (patch) | |
| tree | 5e8c1a633f75f6ec74cfd3b7bfa9d30e5c2c6926 /core | |
| parent | d5062e992e8ff0101e5aea88f214b90c3904a03f (diff) | |
| download | dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.tar dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.tar.gz dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.tar.bz2 dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.tar.lz dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.tar.xz dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.tar.zst dexon-d1f906b4db0b2848b75b6b92528a56967edb94ca.zip | |
Dummy commit to make fullnode work
Diffstat (limited to 'core')
| -rw-r--r-- | core/blockchain.go | 2 | ||||
| -rw-r--r-- | core/governance.go | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 6307cc12f..42cd83267 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -293,7 +293,7 @@ type blockInfo struct { } func (bc *BlockChain) AddConfirmedBlock(block *coreTypes.Block) error { - chainID := block.Position.ChainID + chainID := uint32(0) bc.confirmedBlockInitMu.Lock() _, exist := bc.confirmedBlocks[chainID] if !exist { diff --git a/core/governance.go b/core/governance.go index 538cd2b96..a6c08a1d3 100644 --- a/core/governance.go +++ b/core/governance.go @@ -91,14 +91,11 @@ func (g *Governance) Configuration(round uint64) *coreTypes.Config { configHelper := g.GetGovStateHelperAtRound(round) c := configHelper.Configuration() return &coreTypes.Config{ - NumChains: c.NumChains, LambdaBA: time.Duration(c.LambdaBA) * time.Millisecond, LambdaDKG: time.Duration(c.LambdaDKG) * time.Millisecond, - K: int(c.K), - PhiRatio: c.PhiRatio, NotarySetSize: c.NotarySetSize, DKGSetSize: c.DKGSetSize, - RoundInterval: time.Duration(c.RoundInterval) * time.Millisecond, + RoundInterval: c.RoundInterval, MinBlockInterval: time.Duration(c.MinBlockInterval) * time.Millisecond, } } |