[optimism-rebasing] Fixed lint/test errors

e2e/heuristic_test.go

@@ -242,6 +242,7 @@ func TestWithdrawalEnforcement(t *testing.T) {
 			},
 		},
 	})
+	assert.NoError(t, err, "Error bootstrapping heuristic session")
 
 	optimismPortal, err := bindings.NewOptimismPortal(ts.Cfg.L1Deployments.OptimismPortalProxy, ts.L1Client)
 	assert.NoError(t, err)

e2e/setup.go

@@ -91,7 +91,7 @@ func CreateL2TestSuite(t *testing.T) *L2TestSuite {
 	pagerdutyURL := fmt.Sprintf("http://127.0.0.1:%d", pagerdutyServer.Port)
 
 	appCfg.AlertConfig.PagerdutyAlertEventsURL = pagerdutyURL
-	appCfg.AlertConfig.RoutingParams = DefaultRoutingParams(slackURL)
+	appCfg.AlertConfig.RoutingParams = DefaultRoutingParams(core.StringFromEnv(slackURL))
 
 	pess, kill, err := app.NewPessimismApp(ctx, appCfg)
 	if err != nil {
@@ -130,6 +130,7 @@ func CreateSysTestSuite(t *testing.T) *SysTestSuite {
 	cfg := op_e2e.DefaultSystemConfig(t)
 	cfg.DeployConfig.FinalizationPeriodSeconds = 2
 
+	// Don't output rollup service logs unless ENABLE_ROLLUP_LOGS is set
 	if len(os.Getenv("ENABLE_ROLLUP_LOGS")) == 0 {
 		t.Log("set env 'ENABLE_ROLLUP_LOGS' to show rollup logs")
 		for name, logger := range cfg.Loggers {
@@ -167,7 +168,7 @@ func CreateSysTestSuite(t *testing.T) *SysTestSuite {
 	pagerdutyURL := fmt.Sprintf("http://127.0.0.1:%d", pagerdutyServer.Port)
 
 	appCfg.AlertConfig.PagerdutyAlertEventsURL = pagerdutyURL
-	appCfg.AlertConfig.RoutingParams = DefaultRoutingParams(slackURL)
+	appCfg.AlertConfig.RoutingParams = DefaultRoutingParams(core.StringFromEnv(slackURL))
 
 	pess, kill, err := app.NewPessimismApp(ctx, appCfg)
 	if err != nil {
@@ -231,23 +232,21 @@ func DefaultTestConfig() *config.Config {
 }
 
 // DefaultRoutingParams ... Returns a default routing params configuration for testing
-func DefaultRoutingParams(slackURL string) *core.AlertRoutingParams {
-
-	envURL := core.StringFromEnv(slackURL)
+func DefaultRoutingParams(slackURL core.StringFromEnv) *core.AlertRoutingParams {
 	return &core.AlertRoutingParams{
 		AlertRoutes: &core.SeverityMap{
 			Low: &core.AlertClientCfg{
 				Slack: map[string]*core.AlertConfig{
 					"config": {
-						URL:     envURL,
+						URL:     slackURL,
 						Channel: "#test-low",
 					},
 				},
 			},
 			Medium: &core.AlertClientCfg{
 				Slack: map[string]*core.AlertConfig{
 					"config": {
-						URL:     envURL,
+						URL:     slackURL,
 						Channel: "#test-medium",
 					},
 				},
@@ -260,11 +259,11 @@ func DefaultRoutingParams(slackURL string) *core.AlertRoutingParams {
 			High: &core.AlertClientCfg{
 				Slack: map[string]*core.AlertConfig{
 					"config": {
-						URL:     envURL,
+						URL:     slackURL,
 						Channel: "#test-high",
 					},
 					"config_2": {
-						URL:     envURL,
+						URL:     slackURL,
 						Channel: "#test-high-2",
 					},
 				},

internal/app/app_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/base-org/pessimism/internal/api/server"
 	"github.com/base-org/pessimism/internal/app"
 	"github.com/base-org/pessimism/internal/config"
+	"github.com/base-org/pessimism/internal/core"
 	"github.com/base-org/pessimism/internal/metrics"
 
 	"github.com/stretchr/testify/assert"
@@ -27,8 +28,9 @@ func Test_AppFlow(t *testing.T) {
 			Enabled: false,
 		},
 		AlertConfig: &alert.Config{
-			RoutingCfgPath:          "../../e2e/alert-routing-cfg.yaml",
+			RoutingCfgPath:          "",
 			PagerdutyAlertEventsURL: "test",
+			RoutingParams:           &core.AlertRoutingParams{},
 		},
 	}
 

internal/mocks/oracle.go

@@ -25,7 +25,7 @@ func (md *mockOracleDefinition) ReadRoutine(_ context.Context, _ chan core.Trans
 }
 
 func (md *mockOracleDefinition) Height() (*big.Int, error) {
-	return nil, nil
+	return big.NewInt(0), nil
 }
 
 // NewDummyOracle ... Takes in a register type that specifies the mocked output type