fix most of lint

cosmos · Jul 7, 2019 · 3616fca · 3616fca
1 parent 4d8fa26
commit 3616fca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/x/ibc/04-channel/handshake.go b/x/ibc/04-channel/handshake.go
@@ -187,7 +187,7 @@ func (man Handshaker) OpenTry(ctx sdk.Context,
 		return
 	}
 
-	if !obj.counterparty.nextTimeout.Is(ctx, uint64(timeoutHeight)) {
+	if !obj.counterparty.nextTimeout.Is(ctx, timeoutHeight) {
 		err = errors.New("unexpected counterparty timeout value")
 		return
 	}
@@ -248,7 +248,7 @@ func (man Handshaker) OpenAck(ctx sdk.Context,
 		return
 	}
 
-	if !obj.counterparty.nextTimeout.Is(ctx, uint64(timeoutHeight)) {
+	if !obj.counterparty.nextTimeout.Is(ctx, timeoutHeight) {
 		err = errors.New("unexpected counterparty timeout value")
 		return
 	}
@@ -262,7 +262,7 @@ func (man Handshaker) OpenAck(ctx sdk.Context,
 		}
 	*/
 
-	obj.nextTimeout.Set(ctx, uint64(nextTimeoutHeight))
+	obj.nextTimeout.Set(ctx, nextTimeoutHeight)
 	obj.available.Set(ctx, true)
 
 	return
@@ -304,7 +304,7 @@ func (man Handshaker) OpenConfirm(ctx sdk.Context, connid, chanid string, timeou
 // TODO
 /*
 func (obj HandshakeObject) OpenTimeout(ctx sdk.Context) error {
-	if !(uint64(obj.connection.Client().ConsensusState(ctx).GetHeight()) > obj.nextTimeout.Get(ctx)) {
+	if !(obj.connection.Client().ConsensusState(ctx).GetHeight()) > obj.nextTimeout.Get(ctx)) {
 		return errors.New("timeout height not yet reached")
 	}
 
@@ -388,7 +388,7 @@ func (obj HandshakeObject) CloseAck(ctx sdk.Context, timeoutHeight uint64) error
 }
 
 func (obj HandshakeObject) CloseTimeout(ctx sdk.Context) error {
-	if !(uint64(obj.client.ConsensusState(ctx).GetHeight()) > obj.nextTimeout.Get(ctx)) {
+	if !(obj.client.ConsensusState(ctx).GetHeight()) > obj.nextTimeout.Get(ctx)) {
 		return errors.New("timeout height not yet reached")
 	}
 

diff --git a/x/ibc/04-channel/manager.go b/x/ibc/04-channel/manager.go
@@ -173,8 +173,7 @@ type Object struct {
 	chanid string
 	connid string
 
-	protocol state.Mapping
-	channel  state.Value
+	channel state.Value
 
 	seqsend state.Integer
 	seqrecv state.Integer
@@ -249,7 +248,7 @@ func (obj Object) Send(ctx sdk.Context, packet Packet) error {
 		return errors.New("cannot send packets on this channel")
 	}
 
-	if uint64(obj.connection.Client().ConsensusState(ctx).GetHeight()) >= packet.Timeout() {
+	if obj.connection.Client().ConsensusState(ctx).GetHeight() >= packet.Timeout() {
 		return errors.New("timeout height higher than the latest known")
 	}