diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-01-07 12:04:43 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-07 12:04:43 +0800 |
commit | 492417dd55f6aaf0436c316634b66bf4882420f8 (patch) | |
tree | fa8a0849c43c42adfe63321a7d94664f9030e8b0 /simulation | |
parent | 36d4d760f1d5a108af86094eefbb5303f0334e60 (diff) | |
download | tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.tar tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.tar.gz tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.tar.bz2 tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.tar.lz tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.tar.xz tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.tar.zst tangerine-consensus-492417dd55f6aaf0436c316634b66bf4882420f8.zip |
simulation: Fix simulation stuffs (#405)
* test: fix marshal randomness pullrequest
* Add result for witness latency
Diffstat (limited to 'simulation')
-rw-r--r-- | simulation/app.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/simulation/app.go b/simulation/app.go index 2bf0e48..c72a0a5 100644 --- a/simulation/app.go +++ b/simulation/app.go @@ -51,8 +51,10 @@ const ( blockEventConfirmed // Block delivered by lattice. blockEventDelivered - // block is ready (Randomness calculated) + // Block is ready (Randomness calculated) blockEventReady + // Block is witness + blockEventWitnessed blockEventCount ) @@ -158,7 +160,7 @@ func (a *simApp) TotalOrderingDelivered( a.lock.RLock() defer a.lock.RUnlock() for _, h := range blockHashes { - latencies = append(latencies, time.Since(a.blockTimestamps[h][blockEventConfirmed])) + latencies = append(latencies, time.Since(a.blockTimestamps[h][blockEventReceived])) } }() blockList := &BlockList{ @@ -186,6 +188,11 @@ func (a *simApp) BlockDelivered( panic(err) } } + var witnessBlockHash common.Hash + if err := witnessBlockHash.UnmarshalText(block.Witness.Data); err != nil { + panic(err) + } + a.updateBlockEvent(witnessBlockHash) } else { panic(fmt.Errorf("Block is not confirmed yet: %s", blockHash)) } @@ -193,8 +200,13 @@ func (a *simApp) BlockDelivered( func() { a.latestWitnessReady.L.Lock() defer a.latestWitnessReady.L.Unlock() + data, err := blockHash.MarshalText() + if err != nil { + panic(err) + } a.latestWitness = types.Witness{ Height: result.Height, + Data: data, } a.latestWitnessReady.Broadcast() }() |