Merge branch 'main' into cian/issue#2243-add-a-ics27-host-cli-to-gene…

…rate-ica-packet-data
cosmos · Sep 15, 2022 · 1f12260 · 1f12260
2 parents 3ecdc1d + 80ea89a
commit 1f12260
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -74,30 +74,38 @@ pull_request_rules:
       backport:
         branches:
           - release/v3.2.x
+  - name: backport patches to v3.3.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v3.3.x
+    actions:
+      backport:
+        branches:
+          - release/v3.3.x
   - name: backport patches to v4.0.x branch
     conditions:
       - base=main
       - label=backport-to-v4.0.x
     actions:
       backport:
         branches:
-          - release/v4.0.x  
-  - name: backport patches to v5.0.x branch
+          - release/v4.0.x 
+  - name: backport patches to v4.1.x branch
     conditions:
       - base=main
-      - label=backport-to-v5.0.x
+      - label=backport-to-v4.1.x
     actions:
       backport:
         branches:
-          - release/v5.0.x
-  - name: backport patches to v5.1.x branch
+          - release/v4.1.x  
+  - name: backport patches to v5.0.x branch
     conditions:
       - base=main
-      - label=backport-to-v5.1.x
+      - label=backport-to-v5.0.x
     actions:
       backport:
         branches:
-          - release/v5.1.x
+          - release/v5.0.x
   - name: backport patches to v6.0.x branch
     conditions:
       - base=main

diff --git a/testing/simapp/app.go b/testing/simapp/app.go
@@ -604,6 +604,7 @@ func NewSimApp(
 		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		ibc.NewAppModule(app.IBCKeeper),
 		transfer.NewAppModule(app.TransferKeeper),
+		ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper),
 	)
 
 	app.sm.RegisterStoreDecoders()