Revert "Separate e2e tests by etna activation (#3268)"

This reverts commit ec8a639.

Now that etna is released, there is no need for separate e2e jobs that
test pre- and post-etna behavior.

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
       - name: fuzz_test
         shell: bash
         run: ./scripts/build_fuzz.sh 10 # Run each fuzz test 10 seconds
-  e2e_pre_etna:
+  e2e:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -66,28 +66,7 @@ jobs:
         uses: ./.github/actions/upload-tmpnet-artifact
         if: always()
         with:
-          name: e2e-pre-etna-tmpnet-data
-  e2e_post_etna:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-go-for-project
-      - name: Build AvalancheGo Binary
-        shell: bash
-        run: ./scripts/build.sh -r
-      - name: Run e2e tests
-        uses: ./.github/actions/run-monitored-tmpnet-cmd
-        with:
-          run: E2E_SERIAL=1 ./scripts/tests.e2e.sh --delay-network-shutdown --activate-etna
-          prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
-          prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
-          loki_id: ${{ secrets.LOKI_ID || '' }}
-          loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
-      - name: Upload tmpnet network dir
-        uses: ./.github/actions/upload-tmpnet-artifact
-        if: always()
-        with:
-          name: e2e-post-etna-tmpnet-data
+          name: e2e-tmpnet-data
   e2e_existing_network:
     runs-on: ubuntu-latest
     steps:

tests/e2e/e2e_test.go

@@ -4,27 +4,21 @@
 package e2e_test
 
 import (
-	"encoding/base64"
-	"encoding/json"
 	"testing"
 
 	"github.com/onsi/ginkgo/v2"
-	"github.com/stretchr/testify/require"
 
 	// ensure test packages are scanned by ginkgo
 	_ "github.com/ava-labs/avalanchego/tests/e2e/banff"
 	_ "github.com/ava-labs/avalanchego/tests/e2e/c"
-	_ "github.com/ava-labs/avalanchego/tests/e2e/etna"
 	_ "github.com/ava-labs/avalanchego/tests/e2e/faultinjection"
 	_ "github.com/ava-labs/avalanchego/tests/e2e/p"
 	_ "github.com/ava-labs/avalanchego/tests/e2e/x"
 	_ "github.com/ava-labs/avalanchego/tests/e2e/x/transfer"
 
-	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/tests/e2e/vms"
 	"github.com/ava-labs/avalanchego/tests/fixture/e2e"
 	"github.com/ava-labs/avalanchego/tests/fixture/tmpnet"
-	"github.com/ava-labs/avalanchego/upgrade"
 )
 
 func TestE2E(t *testing.T) {
@@ -40,30 +34,13 @@ func init() {
 var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// Run only once in the first ginkgo process
 
-	tc := e2e.NewTestContext()
-
 	nodes := tmpnet.NewNodesOrPanic(flagVars.NodeCount())
 	subnets := vms.XSVMSubnetsOrPanic(nodes...)
-
-	upgrades := upgrade.Default
-	if flagVars.ActivateEtna() {
-		upgrades.EtnaTime = upgrade.InitiallyActiveTime
-	} else {
-		upgrades.EtnaTime = upgrade.UnscheduledActivationTime
-	}
-
-	upgradeJSON, err := json.Marshal(upgrades)
-	require.NoError(tc, err)
-
-	upgradeBase64 := base64.StdEncoding.EncodeToString(upgradeJSON)
 	return e2e.NewTestEnvironment(
-		tc,
+		e2e.NewTestContext(),
 		flagVars,
 		&tmpnet.Network{
-			Owner: "avalanchego-e2e",
-			DefaultFlags: tmpnet.FlagsMap{
-				config.UpgradeFileContentKey: upgradeBase64,
-			},
+			Owner:   "avalanchego-e2e",
 			Nodes:   nodes,
 			Subnets: subnets,
 		},

tests/fixture/e2e/flags.go

@@ -26,7 +26,6 @@ type FlagVars struct {
 	stopNetwork          bool
 	restartNetwork       bool
 	nodeCount            int
-	activateEtna         bool
 }
 
 func (v *FlagVars) AvalancheGoExecPath() string {
@@ -75,10 +74,6 @@ func (v *FlagVars) NodeCount() int {
 	return v.nodeCount
 }
 
-func (v *FlagVars) ActivateEtna() bool {
-	return v.activateEtna
-}
-
 func getEnvWithDefault(envVar, defaultVal string) string {
 	val := os.Getenv(envVar)
 	if len(val) == 0 {
@@ -149,12 +144,6 @@ func RegisterFlags() *FlagVars {
 		tmpnet.DefaultNodeCount,
 		"number of nodes the network should initially consist of",
 	)
-	flag.BoolVar(
-		&vars.activateEtna,
-		"activate-etna",
-		false,
-		"[optional] activate the etna upgrade",
-	)
 
 	return &vars
 }