e2e: use interchaintest main (cosmos#4662)

* this should get us out of the fork * let's see if this works * Update e2e/go.mod Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com> * fix genesis e2e test --------- Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
notional-labs · Sep 18, 2023 · 82d66ad · 82d66ad
1 parent 234ff4e
commit 82d66ad
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 46 deletions.
diff --git a/e2e/go.mod b/e2e/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/ibc-go/v8 v8.0.0-20230906115913-46ee5f92e1af
 	github.com/docker/docker v24.0.6+incompatible
-	github.com/strangelove-ventures/interchaintest/v8 v8.0.0-20230817191535-cc35cd35adbc
+	github.com/strangelove-ventures/interchaintest/v8 v8.0.0-20230913202406-3e11bf474a3b
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.25.0
 	golang.org/x/mod v0.12.0
@@ -235,6 +235,3 @@ replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.2021
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-//replace github.com/strangelove-ventures/interchaintest/v8 => github.com/notional-labs/interchaintest/v8 v8.0.0-20230905211440-c2dc240d2221
-
-replace github.com/strangelove-ventures/interchaintest/v8 => github.com/colin-axner/interchaintest/v8 v8.0.0-20230906142353-5d89200aad4a
diff --git a/e2e/go.sum b/e2e/go.sum
@@ -339,8 +339,6 @@ github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ
 github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
 github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/colin-axner/interchaintest/v8 v8.0.0-20230906142353-5d89200aad4a h1:rWxVtMsp/X9FVOzIvLCrJ8FWzuAGwpI7jwh51Pgt5Lc=
-github.com/colin-axner/interchaintest/v8 v8.0.0-20230906142353-5d89200aad4a/go.mod h1:aXLHcZ5Tv0R5/LynEsE86bc4UwuHl5TZpzGSLqo79AE=
 github.com/cometbft/cometbft v0.38.0 h1:ogKnpiPX7gxCvqTEF4ly25/wAxUqf181t30P3vqdpdc=
 github.com/cometbft/cometbft v0.38.0/go.mod h1:5Jz0Z8YsHSf0ZaAqGvi/ifioSdVFPtEGrm8Y9T/993k=
 github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo=
@@ -994,6 +992,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
 github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
+github.com/strangelove-ventures/interchaintest/v8 v8.0.0-20230913202406-3e11bf474a3b h1:B3VTNRBsh/kp9+TpMQVXsjUql38+82trUSxPOKd7R/k=
+github.com/strangelove-ventures/interchaintest/v8 v8.0.0-20230913202406-3e11bf474a3b/go.mod h1:ELE57+yyFCeMuxuFHHu50Wxs3/CPmHxH2uBlvCF1lq4=
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=

diff --git a/e2e/tests/upgrades/genesis_test.go b/e2e/tests/upgrades/genesis_test.go
@@ -2,7 +2,6 @@ package upgrades
 
 import (
 	"context"
-	"strings"
 	"testing"
 	"time"
 
@@ -198,12 +197,6 @@ func (s *GenesisTestSuite) HaltChainAndExportGenesis(ctx context.Context, chain
 	state, err := chain.ExportState(ctx, int64(haltHeight))
 	s.Require().NoError(err)
 
-	// state exports currently read from stdout which include log entries, this discards the log entry by the server module
-	// this may need to be updated if log entries are inserted in between exporting of state and the server module logging
-	// see issue: https://github.com/strangelove-ventures/interchaintest/issues/721
-	str := strings.SplitAfter(state, "server")
-	state = str[1]
-
 	appTomlOverrides := make(test.Toml)
 
 	appTomlOverrides["halt-height"] = 0

diff --git a/e2e/testsuite/testconfig.go b/e2e/testsuite/testconfig.go
@@ -394,15 +394,6 @@ func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string, cometCf
 	tmTomlOverrides["log_level"] = cometCfg.LogLevel // change to debug in ~/.ibc-go-e2e-config.json to increase cometbft logging.
 	configFileOverrides["config/config.toml"] = tmTomlOverrides
 
-	var useNewGenesisCommand bool
-	if cc.Binary == defaultBinary && testvalues.SimdNewGenesisCommandsFeatureReleases.IsSupported(cc.Tag) {
-		useNewGenesisCommand = true
-	}
-
-	if cc.Binary == icadBinary && testvalues.IcadNewGenesisCommandsFeatureReleases.IsSupported(cc.Tag) {
-		useNewGenesisCommand = true
-	}
-
 	return ibc.ChainConfig{
 		Type:    "cosmos",
 		Name:    name,
@@ -413,18 +404,17 @@ func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string, cometCf
 				Version:    cc.Tag,
 			},
 		},
-		Bin:                    cc.Binary,
-		Bech32Prefix:           "cosmos",
-		CoinType:               fmt.Sprint(sdk.GetConfig().GetCoinType()),
-		Denom:                  denom,
-		EncodingConfig:         SDKEncodingConfig(),
-		GasPrices:              fmt.Sprintf("0.00%s", denom),
-		GasAdjustment:          1.3,
-		TrustingPeriod:         "508h",
-		NoHostMount:            false,
-		ModifyGenesis:          getGenesisModificationFunction(cc),
-		ConfigFileOverrides:    configFileOverrides,
-		UsingNewGenesisCommand: useNewGenesisCommand,
+		Bin:                 cc.Binary,
+		Bech32Prefix:        "cosmos",
+		CoinType:            fmt.Sprint(sdk.GetConfig().GetCoinType()),
+		Denom:               denom,
+		EncodingConfig:      SDKEncodingConfig(),
+		GasPrices:           fmt.Sprintf("0.00%s", denom),
+		GasAdjustment:       1.3,
+		TrustingPeriod:      "508h",
+		NoHostMount:         false,
+		ModifyGenesis:       getGenesisModificationFunction(cc),
+		ConfigFileOverrides: configFileOverrides,
 	}
 }
 

diff --git a/e2e/testvalues/values.go b/e2e/testvalues/values.go
@@ -67,18 +67,6 @@ var IcadGovGenesisFeatureReleases = semverutil.FeatureReleases{
 	},
 }
 
-// IcadNewGenesisCommandsFeatureReleases represents the releases of icad using the new genesis commands.
-var IcadNewGenesisCommandsFeatureReleases = semverutil.FeatureReleases{
-	MinorVersions: []string{
-		"v0.5",
-	},
-}
-
-// SimdNewGenesisCommandsFeatureReleases represents the releases the simd binary started using the new genesis command.
-var SimdNewGenesisCommandsFeatureReleases = semverutil.FeatureReleases{
-	MajorVersion: "v8",
-}
-
 // SelfParamsFeatureReleases represents the releases the transfer module started managing its own params.
 var SelfParamsFeatureReleases = semverutil.FeatureReleases{
 	MajorVersion: "v8",