wip

tests/e2e/e2e_test.go

@@ -14,7 +14,6 @@ import (
 	// 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"
@@ -47,9 +46,9 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 
 	upgrades := upgrade.Default
 	if flagVars.ActivateFortuna() {
-		upgrades.EtnaTime = upgrade.InitiallyActiveTime
+		upgrades.FUpgradeTime = upgrade.InitiallyActiveTime
 	} else {
-		upgrades.EtnaTime = upgrade.UnscheduledActivationTime
+		upgrades.FUpgradeTime = upgrade.UnscheduledActivationTime
 	}
 
 	upgradeJSON, err := json.Marshal(upgrades)

tests/e2e/p/l1.go

@@ -16,7 +16,6 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/ava-labs/avalanchego/api/info"
 	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/network/peer"
@@ -71,17 +70,6 @@ var _ = e2e.DescribePChain("[L1]", func() {
 		env := e2e.GetEnv(tc)
 		nodeURI := env.GetRandomNodeURI()
 
-		tc.By("verifying Etna is activated", func() {
-			infoClient := info.NewClient(nodeURI.URI)
-			upgrades, err := infoClient.Upgrades(tc.DefaultContext())
-			require.NoError(err)
-
-			now := time.Now()
-			if !upgrades.IsEtnaActivated(now) {
-				ginkgo.Skip("Etna is not activated. L1s are enabled post-Etna, skipping test.")
-			}
-		})
-
 		tc.By("loading the wallet")
 		var (
 			keychain   = env.NewKeychain()