From 7b57a3a12f996ce3e19e53e01868121bb1c27904 Mon Sep 17 00:00:00 2001 From: hopeyen <60078528+hopeyen@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:05:47 +0000 Subject: [PATCH] chore: undo debug/temp changes --- api/clients/v2/disperser_client.go | 4 - common/aws/dynamodb/client.go | 5 +- core/data.go | 16 ---- core/eth/reader.go | 2 - core/meterer/offchain_store.go | 2 - core/meterer/util.go | 1 - disperser/apiserver/server_v2.go | 1 - inabox/deploy/config.go | 2 +- inabox/deploy/config_types.go | 2 - inabox/deploy/deploy.go | 9 --- inabox/geth/genesis.json | 112 +++++++++++++++++++++++++--- inabox/tests/integration_v2_test.go | 4 +- 12 files changed, 104 insertions(+), 56 deletions(-) diff --git a/api/clients/v2/disperser_client.go b/api/clients/v2/disperser_client.go index 14ea0688be..eb78c7da93 100644 --- a/api/clients/v2/disperser_client.go +++ b/api/clients/v2/disperser_client.go @@ -138,10 +138,6 @@ func (c *disperserClient) DisperseBlob( return nil, [32]byte{}, api.NewErrorInternal("uninitialized signer for authenticated dispersal") } - // if c.accountant == nil { - // return nil, [32]byte{}, api.NewErrorInternal("uninitialized accountant for paid dispersal; make sure to call PopulateAccountant after creating the client") - // } - symbolLength := encoding.GetBlobLengthPowerOf2(uint(len(data))) payment, err := c.accountant.AccountBlob(ctx, uint64(symbolLength), quorums, salt) if err != nil { diff --git a/common/aws/dynamodb/client.go b/common/aws/dynamodb/client.go index 5df65f0ce4..b7c57630b3 100644 --- a/common/aws/dynamodb/client.go +++ b/common/aws/dynamodb/client.go @@ -483,14 +483,11 @@ func (c *client) TableExists(ctx context.Context, name string) error { if name == "" { return errors.New("table name is empty") } - describe, err := c.dynamoClient.DescribeTable(ctx, &dynamodb.DescribeTableInput{ + _, err := c.dynamoClient.DescribeTable(ctx, &dynamodb.DescribeTableInput{ TableName: aws.String(name), }) - fmt.Println("desribe table check exists", describe) - fmt.Printf("desribe table check exists: %s\n", *describe.Table.TableName) if err != nil { return err } - return nil } diff --git a/core/data.go b/core/data.go index 0308230dd2..367faad32d 100644 --- a/core/data.go +++ b/core/data.go @@ -619,27 +619,11 @@ type ReservedPayment struct { QuorumSplits []byte } -func DummyReservedPayment() *ReservedPayment { - return &ReservedPayment{ - SymbolsPerSecond: 0, - StartTimestamp: 0, - EndTimestamp: 0, - QuorumNumbers: []uint8{}, - QuorumSplits: []byte{}, - } -} - type OnDemandPayment struct { // Total amount deposited by the user CumulativePayment *big.Int } -func DummyOnDemandPayment() *OnDemandPayment { - return &OnDemandPayment{ - CumulativePayment: big.NewInt(0), - } -} - type BlobVersionParameters struct { CodingRate uint32 MaxNumOperators uint32 diff --git a/core/eth/reader.go b/core/eth/reader.go index ffd244c4e1..16f686bc06 100644 --- a/core/eth/reader.go +++ b/core/eth/reader.go @@ -210,8 +210,6 @@ func (t *Reader) updateContractBindings(blsOperatorStateRetrieverAddr, eigenDASe } } - t.logger.Debug("Make payment vault binding") - var contractPaymentVault *paymentvault.ContractPaymentVault paymentVaultAddr, err := contractEigenDAServiceManager.PaymentVault(&bind.CallOpts{}) if err != nil { diff --git a/core/meterer/offchain_store.go b/core/meterer/offchain_store.go index a8933694fc..5899ca75e9 100644 --- a/core/meterer/offchain_store.go +++ b/core/meterer/offchain_store.go @@ -41,7 +41,6 @@ func NewOffchainStore( return OffchainStore{}, err } - fmt.Println("check if payment tables exist", reservationTableName) err = dynamoClient.TableExists(context.Background(), reservationTableName) if err != nil { return OffchainStore{}, err @@ -54,7 +53,6 @@ func NewOffchainStore( if err != nil { return OffchainStore{}, err } - //TODO: add a separate thread to periodically clean up the tables // delete expired reservation bins (