Axelar integration tests (#248)

* axelarcork integration test stub * add axelarcork genesis state to integration tests * WIP on axelar integration test * computer cork/axelarcork IDHash the same way * Fix up axelarcork msgs.go * WIP on axelarcork integration test * go mod tidy * appease linter * move creation of axelar keeper to after gravity * fix creation of msg for scheduling an axelar cork * WIP for axelar integration test * check all the scheduled corks * v7 upgrade uses zero-size slices with capacities * integration tests normal and scheduled corks * Set the ChainID in upgrade data * integration test for upgrade proxy proposal * appease linter * full axelar integration test
PeggyJV · Dec 19, 2023 · bd0a767 · bd0a767
1 parent 1498c8e
commit bd0a767
Show file tree

Hide file tree

Showing 13 changed files with 628 additions and 39 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -121,6 +121,7 @@ jobs:
       matrix:
         test_type: [
           "ScheduledCork",
+          "AxelarCork",
           "Auction",
           "CellarFees",
           "Incentives",

diff --git a/Makefile b/Makefile
@@ -368,7 +368,10 @@ e2e_basic: e2e_clean_slate
 e2e_scheduled_cork_test: e2e_clean_slate
 	@E2E_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestScheduledCork || make -s fail
 
-e2e_auction_module_test: e2e_clean_slate
+e2e_axelarcork_test: e2e_clean_slate
+	@E2E_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestAxelarCork || make -s fail
+
+e2e_auction_test: e2e_clean_slate
 	@E2E_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestAuction || make -s fail
 
 e2e_cellarfees_test: e2e_clean_slate

diff --git a/app/app.go b/app/app.go
@@ -418,19 +418,6 @@ func NewSommelierApp(
 		app.AccountKeeper, app.BankKeeper, scopedTransferKeeper,
 	)
 
-	// create axelar cork keeper
-	app.AxelarCorkKeeper = axelarcorkkeeper.NewKeeper(
-		appCodec,
-		keys[axelarcorktypes.StoreKey],
-		app.GetSubspace(axelarcorktypes.ModuleName),
-		app.AccountKeeper,
-		app.BankKeeper,
-		app.StakingKeeper,
-		app.TransferKeeper,
-		app.DistrKeeper,
-		app.IBCKeeper.ChannelKeeper,
-		app.GravityKeeper,
-	)
 	transferModule := ibctransfer.NewAppModule(app.TransferKeeper)
 	transferIBCModule := ibctransfer.NewIBCModule(app.TransferKeeper)
 	var transferStack ibcporttypes.IBCModule = transferIBCModule
@@ -459,6 +446,20 @@ func NewSommelierApp(
 		app.ModuleAccountAddressesToNames([]string{distrtypes.ModuleName}),
 	)
 
+	// create axelar cork keeper
+	app.AxelarCorkKeeper = axelarcorkkeeper.NewKeeper(
+		appCodec,
+		keys[axelarcorktypes.StoreKey],
+		app.GetSubspace(axelarcorktypes.ModuleName),
+		app.AccountKeeper,
+		app.BankKeeper,
+		app.StakingKeeper,
+		app.TransferKeeper,
+		app.DistrKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		app.GravityKeeper,
+	)
+
 	app.CorkKeeper = corkkeeper.NewKeeper(
 		appCodec, keys[corktypes.StoreKey], app.GetSubspace(corktypes.ModuleName),
 		app.StakingKeeper, app.GravityKeeper,

diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go
@@ -265,7 +265,7 @@ func pubsubInitGenesis(ctx sdk.Context, pubsubKeeper pubsubkeeper.Keeper) {
 	}
 
 	// Set 7seas publisher intents for existing cellars
-	publisherIntents := make([]*pubsubtypes.PublisherIntent, 25)
+	publisherIntents := make([]*pubsubtypes.PublisherIntent, 0, 25)
 	for _, cellar := range cellars {
 		publisherIntents = append(publisherIntents, &pubsubtypes.PublisherIntent{
 			SubscriptionId:     cellar,
@@ -276,7 +276,7 @@ func pubsubInitGenesis(ctx sdk.Context, pubsubKeeper pubsubkeeper.Keeper) {
 	}
 
 	// Set default subscriptions for 7seas as the publisher for existing cellars
-	defaultSubscriptions := make([]*pubsubtypes.DefaultSubscription, 25)
+	defaultSubscriptions := make([]*pubsubtypes.DefaultSubscription, 0, 25)
 	for _, cellar := range cellars {
 		defaultSubscriptions = append(defaultSubscriptions, &pubsubtypes.DefaultSubscription{
 			SubscriptionId:  cellar,
@@ -286,7 +286,7 @@ func pubsubInitGenesis(ctx sdk.Context, pubsubKeeper pubsubkeeper.Keeper) {
 
 	// Create subscribers and intents for existing validators
 	subscribers := createSubscribers()
-	subscriberIntents := make([]*pubsubtypes.SubscriberIntent, 875)
+	subscriberIntents := make([]*pubsubtypes.SubscriberIntent, 0, 875)
 	for _, subscriber := range subscribers {
 		for _, cellar := range cellars {
 			subscriberIntents = append(subscriberIntents, &pubsubtypes.SubscriberIntent{
@@ -318,7 +318,7 @@ func pubsubInitGenesis(ctx sdk.Context, pubsubKeeper pubsubkeeper.Keeper) {
 // leaving out made_in_block because I can't find their validator on-chain
 // blockhunters hadn't been merged, but verified and added here
 func createSubscribers() []*pubsubtypes.Subscriber {
-	subscribers := make([]*pubsubtypes.Subscriber, 35)
+	subscribers := make([]*pubsubtypes.Subscriber, 0, 35)
 
 	subscribers = append(subscribers, &pubsubtypes.Subscriber{
 		Address: "somm1s2q8avjykkztudpl8k60f0ns4v5mvnjp5t366c",

diff --git a/go.mod b/go.mod
@@ -3,6 +3,8 @@ module github.com/peggyjv/sommelier/v7
 go 1.19
 
 require (
+	cosmossdk.io/errors v1.0.0-beta.7
+	cosmossdk.io/math v1.0.0-rc.0
 	github.com/cosmos/cosmos-sdk v0.46.14
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/ibc-go/v6 v6.2.0
@@ -34,8 +36,6 @@ require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v0.12.0 // indirect
 	cloud.google.com/go/storage v1.28.1 // indirect
-	cosmossdk.io/errors v1.0.0-beta.7 // indirect
-	cosmossdk.io/math v1.0.0-rc.0 // indirect
 	filippo.io/edwards25519 v1.0.0-rc.1 // indirect
 	github.com/99designs/keyring v1.2.1 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect

diff --git a/go.sum b/go.sum
@@ -842,10 +842,6 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/peggyjv/gravity-bridge/module/v4 v4.0.0-20231130211750-e1fa9902c9d9 h1:3aqB5WI8S1FtvsoU7HAM+35czUtDvEZJa1feK8/9xRg=
-github.com/peggyjv/gravity-bridge/module/v4 v4.0.0-20231130211750-e1fa9902c9d9/go.mod h1:biwoVDKWggMYtzuUZOuqaJD8B40XHrXg3zOJjeAhT78=
-github.com/peggyjv/gravity-bridge/module/v4 v4.0.0-20231211214131-bf2a31eb986f h1:xaVjypGpS3+VUXzEb2YFaTK632Id6jVWY1ViS4nljJs=
-github.com/peggyjv/gravity-bridge/module/v4 v4.0.0-20231211214131-bf2a31eb986f/go.mod h1:n8Jj3X+w6q0Xz19w8feRRl2sfIGV+3FGU4anzXBQGbA=
 github.com/peggyjv/gravity-bridge/module/v4 v4.0.0 h1:jH10FodlMxzGdbxAxeNpsql9qhYDlmwqciwOuwuU0LQ=
 github.com/peggyjv/gravity-bridge/module/v4 v4.0.0/go.mod h1:n8Jj3X+w6q0Xz19w8feRRl2sfIGV+3FGU4anzXBQGbA=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=