fix: lint

Layr-Labs · Oct 25, 2024 · 4218aba · 4218aba
1 parent 79945f9
commit 4218aba
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 236 deletions.
diff --git a/contracts/bindings/AVSDirectory/binding.go b/contracts/bindings/AVSDirectory/binding.go
diff --git a/contracts/bindings/BLSApkRegistry/binding.go b/contracts/bindings/BLSApkRegistry/binding.go
diff --git a/contracts/bindings/DelegationManager/binding.go b/contracts/bindings/DelegationManager/binding.go
diff --git a/contracts/bindings/EigenDAServiceManager/binding.go b/contracts/bindings/EigenDAServiceManager/binding.go
diff --git a/contracts/bindings/EjectionManager/binding.go b/contracts/bindings/EjectionManager/binding.go
diff --git a/contracts/bindings/IndexRegistry/binding.go b/contracts/bindings/IndexRegistry/binding.go
diff --git a/contracts/bindings/MockRollup/binding.go b/contracts/bindings/MockRollup/binding.go
diff --git a/contracts/bindings/OperatorStateRetriever/binding.go b/contracts/bindings/OperatorStateRetriever/binding.go
diff --git a/contracts/bindings/RegistryCoordinator/binding.go b/contracts/bindings/RegistryCoordinator/binding.go
diff --git a/contracts/bindings/StakeRegistry/binding.go b/contracts/bindings/StakeRegistry/binding.go
diff --git a/core/meterer/meterer_test.go b/core/meterer/meterer_test.go
@@ -104,10 +104,6 @@ func setup(_ *testing.M) {
 
 	logger = logging.NewNoopLogger()
 	config := meterer.Config{
-		// PricePerSymbol:         2,
-		// MinNumSymbols:          3,
-		// GlobalSymbolsPerSecond: 1009,
-		// ReservationWindow:      1,
 		ChainReadTimeout: 3 * time.Second,
 	}
 

diff --git a/disperser/apiserver/server_test.go b/disperser/apiserver/server_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	commonaws "github.com/Layr-Labs/eigenda/common/aws"
 	"github.com/Layr-Labs/eigenda/core/auth"
 	"github.com/Layr-Labs/eigenda/core/meterer"
 	"github.com/Layr-Labs/eigenda/core/mock"
@@ -651,18 +650,29 @@ func newTestServer(transactor core.Writer) *apiserver.DispersalServer {
 
 	mockState := &mock.MockOnchainPaymentState{}
 
-	clientConfig := commonaws.ClientConfig{
-		Region:          "us-east-1",
-		AccessKey:       "localstack",
-		SecretAccessKey: "localstack",
-		EndpointURL:     fmt.Sprintf("http://0.0.0.0:4566"),
+	table_names := []string{"reservations-apiserver-test", "ondemand-apiserver-test", "global-apiserver-test"}
+
+	err = meterer.CreateReservationTable(awsConfig, table_names[0])
+	if err != nil {
+		teardown()
+		panic("failed to create reservation table")
+	}
+	err = meterer.CreateOnDemandTable(awsConfig, table_names[1])
+	if err != nil {
+		teardown()
+		panic("failed to create ondemand table")
+	}
+	err = meterer.CreateGlobalReservationTable(awsConfig, table_names[2])
+	if err != nil {
+		teardown()
+		panic("failed to create global reservation table")
 	}
 
 	store, err := meterer.NewOffchainStore(
-		clientConfig,
-		"reservations",
-		"ondemand",
-		"global",
+		awsConfig,
+		table_names[0],
+		table_names[1],
+		table_names[2],
 		logger,
 	)
 	if err != nil {

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -28,7 +28,6 @@ import (
 
 	clientsmock "github.com/Layr-Labs/eigenda/api/clients/mock"
 	commonaws "github.com/Layr-Labs/eigenda/common/aws"
-	commondynamodb "github.com/Layr-Labs/eigenda/common/aws/dynamodb"
 	"github.com/Layr-Labs/eigenda/core/meterer"
 	"github.com/Layr-Labs/eigenda/disperser/apiserver"
 	dispatcher "github.com/Layr-Labs/eigenda/disperser/batcher/grpc"
@@ -76,7 +75,6 @@ var (
 
 	dockertestPool     *dockertest.Pool
 	dockertestResource *dockertest.Resource
-	dynamoClient       *commondynamodb.Client
 	clientConfig       commonaws.ClientConfig
 
 	deployLocalStack bool
@@ -261,11 +259,29 @@ func mustMakeDisperser(t *testing.T, cst core.IndexedChainState, store disperser
 		EndpointURL:     fmt.Sprintf("http://0.0.0.0:%s", localStackPort),
 	}
 
+	table_names := []string{"reservations-integration-test", "ondemand-integration-test", "global-integration-test"}
+
+	err = meterer.CreateReservationTable(clientConfig, table_names[0])
+	if err != nil {
+		teardown()
+		panic("failed to create reservation table")
+	}
+	err = meterer.CreateOnDemandTable(clientConfig, table_names[1])
+	if err != nil {
+		teardown()
+		panic("failed to create ondemand table")
+	}
+	err = meterer.CreateGlobalReservationTable(clientConfig, table_names[2])
+	if err != nil {
+		teardown()
+		panic("failed to create global reservation table")
+	}
+
 	offchainStore, err := meterer.NewOffchainStore(
 		clientConfig,
-		"reservations",
-		"ondemand",
-		"global",
+		table_names[0],
+		table_names[1],
+		table_names[2],
 		logging.NewNoopLogger(),
 	)
 	if err != nil {