use rand.Int63n, remove underflow check, remove unnecessary cast

This commit is contained in:
Anton Kaliaev
2017-12-01 19:22:18 -06:00
parent 922af7c405
commit 10f7858453
4 changed files with 5 additions and 7 deletions

View File

@ -23,7 +23,7 @@ func makePeers(numPeers int, minHeight, maxHeight int64) map[string]testPeer {
peers := make(map[string]testPeer, numPeers)
for i := 0; i < numPeers; i++ {
peerID := cmn.RandStr(12)
height := minHeight + int64(rand.Intn(int(maxHeight-minHeight)))
height := minHeight + rand.Int63n(maxHeight-minHeight)
peers[peerID] = testPeer{peerID, height}
}
return peers

View File

@ -74,9 +74,7 @@ func BlockchainInfo(minHeight, maxHeight int64) (*ctypes.ResultBlockchainInfo, e
// maximum 20 block metas
const limit int64 = 20
if maxHeight >= limit { // to prevent underflow
minHeight = cmn.MaxInt64(minHeight, maxHeight-limit)
}
minHeight = cmn.MaxInt64(minHeight, maxHeight-limit)
logger.Debug("BlockchainInfoHandler", "maxHeight", maxHeight, "minHeight", minHeight)

View File

@ -88,8 +88,8 @@ func Tx(hash []byte, prove bool) (*ctypes.ResultTx, error) {
var proof types.TxProof
if prove {
// TODO: handle overflow
block := blockStore.LoadBlock(height)
// TODO: handle overflow
proof = block.Data.Txs.Proof(index)
}
@ -187,8 +187,8 @@ func TxSearch(query string, prove bool) ([]*ctypes.ResultTx, error) {
index := r.Index
if prove {
// TODO: handle overflow
block := blockStore.LoadBlock(height)
// TODO: handle overflow
proof = block.Data.Txs.Proof(int(index))
}

View File

@ -53,7 +53,7 @@ func (valSet *ValidatorSet) IncrementAccum(times int) {
// Add VotingPower * times to each validator and order into heap.
validatorsHeap := cmn.NewHeap()
for _, val := range valSet.Validators {
val.Accum += int64(val.VotingPower) * int64(times) // TODO: mind overflow
val.Accum += val.VotingPower * int64(times) // TODO: mind overflow
validatorsHeap.Push(val, accumComparable{val})
}