lint and cleanup

cosmos · Aug 6, 2024 · fa091a5 · fa091a5
1 parent 3194b01
commit fa091a5
Show file tree

Hide file tree

Showing 14 changed files with 263 additions and 62 deletions.
diff --git a/abi/ICS26Router.json b/abi/ICS26Router.json
@@ -1073,6 +1073,22 @@
     "name": "ReentrancyGuardReentrantCall",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "SafeCastOverflowedUintDowncast",
+    "inputs": [
+      {
+        "name": "bits",
+        "type": "uint8",
+        "internalType": "uint8"
+      },
+      {
+        "name": "value",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "StringsInsufficientHexLength",

diff --git a/e2e/artifacts/genesis.json b/e2e/artifacts/genesis.json
@@ -1,6 +1,6 @@
 {
   "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000012754500000000000000000000000000000000000000000000000000000000001baf800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000673696d642d310000000000000000000000000000000000000000000000000000",
-  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b0b92862093024debc13c1fab2cce33d04895624033edca5cc22f7266085eca4c6461606c79e13ccd4e467cae775cbc073ccca2735947069c0255e78337c50dcdee823",
+  "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b24dfc0a376dcfbf32aa896d68958779c5d6ef4c73b5f0eb8c55e74eaeb1399a9f8250b29f00b95808b8b596d78d77bbb1f263250537c5561baf2dc879ae5226c9ccd7",
   "updateClientVkey": "0x0068b9d316aced51c5923b2d50692f4a6a9bfefcd89392914b90e77545727fbe",
   "membershipVkey": "0x00a4245d249b5c35c9782cc899c8e370a35d5d928187dc9e7acbab7096764b72",
   "ucAndMembershipVkey": "0x00cea834e3408d45d29080a3146e4fb1fd0c06503d655bd787219caac86cf59c"

diff --git a/e2e/interchaintestv8/e2esuite/grpc_query.go b/e2e/interchaintestv8/e2esuite/grpc_query.go
@@ -3,7 +3,6 @@ package e2esuite
 import (
 	"context"
 	"fmt"
-	abci "github.com/cometbft/cometbft/abci/types"
 
 	"github.com/cosmos/gogoproto/proto"
 	"google.golang.org/grpc"
@@ -13,6 +12,8 @@ import (
 	msgv1 "cosmossdk.io/api/cosmos/msg/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 
+	abci "github.com/cometbft/cometbft/abci/types"
+
 	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
 )
 

diff --git a/e2e/interchaintestv8/ibc_eureka_test.go b/e2e/interchaintestv8/ibc_eureka_test.go
@@ -2,13 +2,10 @@ package main
 
 import (
 	"context"
-	sdkmath "cosmossdk.io/math"
 	"crypto/ecdsa"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	abci "github.com/cometbft/cometbft/abci/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"math/big"
 	"os"
 	"strconv"
@@ -23,8 +20,13 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 
+	sdkmath "cosmossdk.io/math"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
+	abci "github.com/cometbft/cometbft/abci/types"
+
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
@@ -357,7 +359,6 @@ func (s *IbcEurekaTestSuite) TestICS20Transfer() {
 			s.Require().NoError(err)
 			s.Require().Equal(transferAmount, ics20TransferBalance)
 		}))
-
 	}))
 
 	// TODO: When using a non-mock light client on the cosmos side, the client there needs to be updated at this point
@@ -511,8 +512,8 @@ func (s *IbcEurekaTestSuite) TestICS20Transfer() {
 			Data:   []byte(packetCommitmentPath),
 			Prove:  true,
 		})
-		_ = err
-		_ = storeProofResp
+		s.Require().NoError(err)
+		s.Require().Equal(uint32(0), storeProofResp.Code)
 		proofHeight, ucAndMemProof, err := operator.UpdateClientAndMembershipProof(
 			uint64(trustedHeight), uint64(latestHeight), packetCommitmentPath,
 			"--trust-level", testvalues.DefaultTrustLevel.String(),
@@ -523,7 +524,7 @@ func (s *IbcEurekaTestSuite) TestICS20Transfer() {
 		msg := ics26router.IICS26RouterMsgsMsgRecvPacket{
 			Packet: ics26router.IICS26RouterMsgsPacket{
 				Sequence:         uint32(returnPacket.Sequence),
-				TimeoutTimestamp: returnPacket.TimeoutTimestamp / 1_000_000_000, // Nano to seconds
+				TimeoutTimestamp: returnPacket.TimeoutTimestamp,
 				SourcePort:       returnPacket.SourcePort,
 				SourceChannel:    returnPacket.SourceChannel,
 				DestPort:         returnPacket.DestinationPort,
@@ -569,12 +570,12 @@ func (s *IbcEurekaTestSuite) TestICS20Transfer() {
 		txResp, err := s.BroadcastMessages(ctx, simd, s.UserB, 200_000, &channeltypes.MsgAcknowledgement{
 			Packet:          returnPacket,
 			Acknowledgement: returnWriteAckEvent.Acknowledgement,
-			ProofAcked:      []byte("doesn't matter"),
+			ProofAcked:      []byte("doesn't matter"), // Because mock light client
 			ProofHeight:     clienttypes.Height{},
 			Signer:          s.UserB.FormattedAddress(),
 		})
 		s.Require().NoError(err)
-		s.Require().Equal(0, txResp.Code)
+		s.Require().Equal(uint32(0), txResp.Code)
 	}))
 }