Cleanup and retain only reorg stuffs

integration-tests/ccip-tests/load/ccip_loadgen.go

@@ -248,7 +248,10 @@ func (c *CCIPE2ELoad) Call(_ *wasp.Generator) *wasp.Response {
 	// if the token address is 0x0 it will use Native as fee token and the fee amount should be mentioned in bind.TransactOpts's value
 	fee, err := sourceCCIP.Common.Router.GetFee(destChainSelector, msg)
 	if err != nil {
-		res.Error = fmt.Sprintf("reqNo %d err %s - while getting fee from router", msgSerialNo, err.Error())
+		res.Error = fmt.Sprintf("reqNo %d err %s - while getting fee from router - msg Data %x FeeToken %s TokenAmounts %+v ExtraArgs %x Receiver %x",
+			msgSerialNo, err.Error(),
+			msg.Data, msg.FeeToken, msg.TokenAmounts, msg.ExtraArgs, msg.Receiver)
+
 		res.Failed = true
 		return res
 	}
@@ -268,6 +271,7 @@ func (c *CCIPE2ELoad) Call(_ *wasp.Generator) *wasp.Response {
 	}
 
 	txConfirmationTime := time.Now().UTC()
+	// wait for the tx to be mined, timeout is set to 10 minutes
 	lggr.Info().Str("tx", sendTx.Hash().Hex()).Msg("waiting for tx to be mined")
 	lggr = lggr.With().Str("Msg Tx", sendTx.Hash().String()).Logger()
 

integration-tests/ccip-tests/load/ccip_test.go

@@ -49,20 +49,6 @@ func setupReorgSuite(t *testing.T, loadArgs *LoadArgs) *ch.ReorgSuite {
 	return rs
 }
 
-func setupGasSuite(t *testing.T, loadArgs *LoadArgs) *ch.GasSuite {
-	rs, err := ch.NewGasSuite(t, &ch.GasSuiteConfig{
-		SrcGethHTTPURL: loadArgs.TestSetupArgs.Env.K8Env.URLs["source-chain_http"][0],
-		DstGethHTTPURL: loadArgs.TestSetupArgs.Env.K8Env.URLs["dest-chain_http"][0],
-		GrafanaConfig: &ch.GrafanaConfig{
-			GrafanaURL:   *loadArgs.TestCfg.EnvInput.Logging.Grafana.BaseUrl,
-			GrafanaToken: *loadArgs.TestCfg.EnvInput.Logging.Grafana.BearerToken,
-			DashboardURL: *loadArgs.TestCfg.EnvInput.Logging.Grafana.DashboardUrl,
-		},
-	})
-	require.NoError(t, err)
-	return rs
-}
-
 // TestLoadCCIPStableRPS clean and stable load test
 func TestLoadCCIPStableRPS(t *testing.T) {
 	t.Parallel()
@@ -143,50 +129,6 @@ func TestLoadCCIPStableRPSReorgsAboveFinality(t *testing.T) {
 	}, 3*time.Minute, 20*time.Second, "not all the nodes report finality violation")
 }
 
-func TestLoadCCIPStableRPSGasSpike(t *testing.T) {
-	t.Parallel()
-	lggr := logging.GetTestLogger(t)
-	testArgs := NewLoadArgs(t, lggr)
-	testArgs.Setup()
-	// if the test runs on remote runner
-	if len(testArgs.TestSetupArgs.Lanes) == 0 {
-		return
-	}
-	t.Cleanup(func() {
-		log.Info().Msg("Tearing down the environment")
-		require.NoError(t, testArgs.TestSetupArgs.TearDown())
-	})
-
-	chcfg := testArgs.TestCfg.TestGroupInput.ChaosGasProfile
-	gs := setupGasSuite(t, testArgs)
-	gs.ChangeBlockGasBaseFee(chcfg.TargetChain, chcfg.StartGasPrice, chcfg.GasRaisePercentage, chcfg.Duration.Duration(), chcfg.Spike)
-
-	testArgs.TriggerLoadByLane()
-	testArgs.Wait()
-}
-
-func TestLoadCCIPStableRPSChangeBlockGasLimit(t *testing.T) {
-	t.Parallel()
-	lggr := logging.GetTestLogger(t)
-	testArgs := NewLoadArgs(t, lggr)
-	testArgs.Setup()
-	// if the test runs on remote runner
-	if len(testArgs.TestSetupArgs.Lanes) == 0 {
-		return
-	}
-	t.Cleanup(func() {
-		log.Info().Msg("Tearing down the environment")
-		require.NoError(t, testArgs.TestSetupArgs.TearDown())
-	})
-
-	chcfg := testArgs.TestCfg.TestGroupInput.ChaosGasLimitProfile
-	gs := setupGasSuite(t, testArgs)
-	gs.ChangeNextBlockGasLimit(1*time.Minute, 1*time.Minute, chcfg.TargetChain, chcfg.BlockGasLimitPercentage)
-
-	testArgs.TriggerLoadByLane()
-	testArgs.Wait()
-}
-
 // TestLoadCCIPWithUpgradeNodeVersion starts all nodes with a specific version, triggers load and then upgrades the node version as the load is running
 func TestLoadCCIPWithUpgradeNodeVersion(t *testing.T) {
 	t.Parallel()

integration-tests/ccip-tests/testconfig/ccip.go

@@ -9,10 +9,6 @@ import (
 	"github.com/pelletier/go-toml/v2"
 	"github.com/rs/zerolog"
 
-	ctfK8config "github.com/smartcontractkit/chainlink-testing-framework/k8s/config"
-
-	testutils "github.com/smartcontractkit/chainlink/integration-tests/ccip-tests/utils"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/config"
 	ctfconfig "github.com/smartcontractkit/chainlink-testing-framework/config"
 	ctfK8config "github.com/smartcontractkit/chainlink-testing-framework/k8s/config"
@@ -294,7 +290,7 @@ type CCIPTestGroupConfig struct {
 	CommitInflightExpiry            *config.Duration                      `toml:",omitempty"`
 	StoreLaneConfig                 *bool                                 `toml:",omitempty"`
 	LoadProfile                     *LoadProfile                          `toml:",omitempty"`
-	ChaosReorgProfile         *ChaosReorgProfile                    `toml:",omitempty"`
+	ChaosReorgProfile               *ChaosReorgProfile                    `toml:",omitempty"`
 }
 
 func (c *CCIPTestGroupConfig) Validate() error {