Merge branch 'main' into bolten/v7-upgrade-tweaks

PeggyJV · Dec 14, 2023 · 1101e63 · 1101e63
2 parents fc3b675 + 6dd3580
commit 1101e63
Show file tree

Hide file tree

Showing 25 changed files with 930 additions and 121 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -120,11 +120,11 @@ jobs:
       fail-fast: false
       matrix:
         test_type: [
-          "Cork",
           "ScheduledCork",
-          "AuctionModule",
+          "Auction",
           "CellarFees",
           "Incentives",
+          "Pubsub",
         ]
     steps:
       - name: Set up Go 1.19

diff --git a/Makefile b/Makefile
@@ -369,14 +369,17 @@ 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_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestAuctionModule || make -s fail
+	@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
 	@E2E_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestCellarFees || make -s fail
 
 e2e_incentives_test: e2e_clean_slate
 	@E2E_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestIncentives || make -s fail
 
+e2e_pubsub_test: e2e_clean_slate
+	@E2E_SKIP_CLEANUP=true integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m TestPubsub || make -s fail
+
 fail:
 	@echo 'test failed; dumping container logs into ./testlogs for review'
 	@docker logs ethereum > testlogs/ethereum.log 2>&1 || true

diff --git a/integration_tests/auction_test.go b/integration_tests/auction_test.go
@@ -12,7 +12,7 @@ import (
 	cellarfees "github.com/peggyjv/sommelier/v7/x/cellarfees/types"
 )
 
-func (s *IntegrationTestSuite) TestAuctionModule() {
+func (s *IntegrationTestSuite) TestAuction() {
 	s.Run("Bring up chain, test governance proposal to set token prices, submit some bids, and finish an auction", func() {
 		val := s.chain.validators[0]
 		kb, err := val.keyring()

diff --git a/integration_tests/cork_test.go b/integration_tests/cork_test.go