ci: fix ci

srdtrk · Mar 24, 2024 · 9671bd4 · 9671bd4
1 parent 7661eeb
commit 9671bd4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -32,18 +32,16 @@ jobs:
       matrix:
         test:
           - TestIcaContractChannelHandshake_Ordered_Protobuf
-          - TestIcaContractChannelHandshake_Ordered_Proto3Json
           - TestIcaContractChannelHandshake_Unordered_Protobuf
-          - TestIcaContractChannelHandshake_Unordered_Proto3Json
           - TestIcaRelayerInstantiatedChannelHandshake
           - TestRecoveredIcaContractInstantiatedChannelHandshake
-          - TestIcaContractExecution_Ordered_Proto3Json
+          - TestIcaContractExecution_Ordered_Protobuf
           - TestIcaContractExecution_Unordered_Protobuf
-          - TestIcaContractTimeoutPacket_Ordered_Proto3Json
+          - TestIcaContractTimeoutPacket_Ordered_Protobuf
           - TestIcaContractTimeoutPacket_Unordered_Protobuf
           - TestOwnerCreateIcaContract
           - TestOwnerPredefinedAction
-          - TestSendCosmosMsgs_Ordered_Proto3Json
+          - TestSendCosmosMsgs_Ordered_Protobuf
           - TestSendCosmosMsgs_Unordered_Protobuf
           - TestSendWasmMsgsProtobufEncoding
           - TestMigrateOrderedToUnordered

diff --git a/e2e/Readme.md b/e2e/Readme.md
@@ -15,16 +15,14 @@ These tests are designed to test the ICA contract itself and its interaction wit
 All contract tests are located in `interchaintest/contract_test.go` file. Currently, there are four tests in this file:
 
 - `TestIcaContractChannelHandshake_Ordered_Protobuf`
-- `TestIcaContractChannelHandshake_Ordered_Proto3Json`
 - `TestIcaContractChannelHandshake_Unordered_Protobuf`
-- `TestIcaContractChannelHandshake_Unordered_Proto3Json`
 - `TestIcaRelayerInstantiatedChannelHandshake`
 - `TestRecoveredIcaContractInstantiatedChannelHandshake`
-- `TestIcaContractExecution_Ordered_Proto3Json`
+- `TestIcaContractExecution_Ordered_Protobuf`
 - `TestIcaContractExecution_Unordered_Protobuf`
-- `TestIcaContractTimeoutPacket_Ordered_Proto3Json`
+- `TestIcaContractTimeoutPacket_Ordered_Protobuf`
 - `TestIcaContractTimeoutPacket_Unordered_Protobuf`
-- `TestSendCosmosMsgs_Ordered_Proto3Json`
+- `TestSendCosmosMsgs_Ordered_Protobuf`
 - `TestSendCosmosMsgs_Unordered_Protobuf`
 - `TestSendWasmMsgsProtobufEncoding`
 - `TestMigrateOrderedToUnordered`

diff --git a/e2e/interchaintest/contract_test.go b/e2e/interchaintest/contract_test.go
@@ -106,14 +106,14 @@ func TestWithContractTestSuite(t *testing.T) {
 }
 
 func (s *ContractTestSuite) TestIcaContractChannelHandshake_Ordered_Protobuf() {
-	s.IcaContractChannelHandshakeTest_WithEncodingAndOrdering(icacontroller.IbcOrder_OrderOrdered)
+	s.IcaContractChannelHandshakeTest_WithOrdering(icacontroller.IbcOrder_OrderOrdered)
 }
 
 func (s *ContractTestSuite) TestIcaContractChannelHandshake_Unordered_Protobuf() {
-	s.IcaContractChannelHandshakeTest_WithEncodingAndOrdering(icacontroller.IbcOrder_OrderUnordered)
+	s.IcaContractChannelHandshakeTest_WithOrdering(icacontroller.IbcOrder_OrderUnordered)
 }
 
-func (s *ContractTestSuite) IcaContractChannelHandshakeTest_WithEncodingAndOrdering(ordering icacontroller.IbcOrder) {
+func (s *ContractTestSuite) IcaContractChannelHandshakeTest_WithOrdering(ordering icacontroller.IbcOrder) {
 	ctx := context.Background()
 
 	// This starts the chains, relayer, creates the user accounts, creates the ibc clients and connections,
@@ -329,14 +329,14 @@ func (s *ContractTestSuite) TestRecoveredIcaContractInstantiatedChannelHandshake
 }
 
 func (s *ContractTestSuite) TestIcaContractExecution_Ordered_Protobuf() {
-	s.IcaContractExecutionTestWithEncoding(icacontroller.IbcOrder_OrderOrdered)
+	s.IcaContractExecutionTestWithOrdering(icacontroller.IbcOrder_OrderOrdered)
 }
 
 func (s *ContractTestSuite) TestIcaContractExecution_Unordered_Protobuf() {
-	s.IcaContractExecutionTestWithEncoding(icacontroller.IbcOrder_OrderUnordered)
+	s.IcaContractExecutionTestWithOrdering(icacontroller.IbcOrder_OrderUnordered)
 }
 
-func (s *ContractTestSuite) IcaContractExecutionTestWithEncoding(ordering icacontroller.IbcOrder) {
+func (s *ContractTestSuite) IcaContractExecutionTestWithOrdering(ordering icacontroller.IbcOrder) {
 	ctx := context.Background()
 
 	// This starts the chains, relayer, creates the user accounts, creates the ibc clients and connections,
@@ -494,22 +494,22 @@ func (s *ContractTestSuite) IcaContractExecutionTestWithEncoding(ordering icacon
 }
 
 func (s *ContractTestSuite) TestSendCosmosMsgs_Ordered_Protobuf() {
-	s.SendCosmosMsgsTestWithEncoding(icacontroller.IbcOrder_OrderOrdered)
+	s.SendCosmosMsgsTestWithOrdering(icacontroller.IbcOrder_OrderOrdered)
 }
 
 func (s *ContractTestSuite) TestSendCosmosMsgs_Unordered_Protobuf() {
-	s.SendCosmosMsgsTestWithEncoding(icacontroller.IbcOrder_OrderUnordered)
+	s.SendCosmosMsgsTestWithOrdering(icacontroller.IbcOrder_OrderUnordered)
 }
 
-// SendCosmosMsgsTestWithEncoding tests some more CosmosMsgs that are not covered by the IcaContractExecutionTestWithEncoding.
+// SendCosmosMsgsTestWithOrdering tests some more CosmosMsgs that are not covered by the IcaContractExecutionTestWithOrdering.
 // The following CosmosMsgs are tested here:
 //
 // - Bank::Send
 // - Stargate
 // - VoteWeighted
 // - FundCommunityPool
 // - SetWithdrawAddress
-func (s *ContractTestSuite) SendCosmosMsgsTestWithEncoding(ordering icacontroller.IbcOrder) {
+func (s *ContractTestSuite) SendCosmosMsgsTestWithOrdering(ordering icacontroller.IbcOrder) {
 	ctx := context.Background()
 
 	// This starts the chains, relayer, creates the user accounts, creates the ibc clients and connections,