remove unnecessary casts (Refs #911)

This commit is contained in:
Anton Kaliaev
2017-11-30 18:49:40 -06:00
committed by Ethan Buchman
parent b3492356e6
commit 86af889dfb
3 changed files with 5 additions and 6 deletions

View File

@ -48,8 +48,8 @@ func TestSearchForEndHeight(t *testing.T) {
t.Fatal(err)
}
h := 3
gr, found, err := wal.SearchForEndHeight(uint64(h))
h := uint64(3)
gr, found, err := wal.SearchForEndHeight(h)
assert.NoError(t, err, cmn.Fmt("expected not to err on height %d", h))
assert.True(t, found, cmn.Fmt("expected to find end height for %d", h))
assert.NotNil(t, gr, "expected group not to be nil")
@ -61,7 +61,6 @@ func TestSearchForEndHeight(t *testing.T) {
rs, ok := msg.Msg.(tmtypes.EventDataRoundState)
assert.True(t, ok, "expected message of type EventDataRoundState")
assert.Equal(t, rs.Height, h+1, cmn.Fmt("wrong height"))
}
var initOnce sync.Once

View File

@ -433,7 +433,7 @@ type mempoolTx struct {
// Height returns the height for this transaction
func (memTx *mempoolTx) Height() uint64 {
return uint64(atomic.LoadUint64(&memTx.height))
return atomic.LoadUint64(&memTx.height)
}
//--------------------------------------------------------------------------------

View File

@ -13,7 +13,7 @@ type tm2pb struct{}
func (tm2pb) Header(header *Header) *types.Header {
return &types.Header{
ChainId: header.ChainID,
Height: uint64(header.Height),
Height: header.Height,
Time: uint64(header.Time.Unix()),
NumTxs: uint64(header.NumTxs),
LastBlockId: TM2PB.BlockID(header.LastBlockID),