From 785468757c65d642363278e7ca67bbd2e8867793 Mon Sep 17 00:00:00 2001 From: hopeyen Date: Wed, 9 Oct 2024 14:57:39 -0700 Subject: [PATCH] fix: db creation in tests, mock filename --- core/meterer/meterer_test.go | 19 +++++-------------- .../{onchain_state.go => payment_state.go} | 0 2 files changed, 5 insertions(+), 14 deletions(-) rename core/mock/{onchain_state.go => payment_state.go} (100%) diff --git a/core/meterer/meterer_test.go b/core/meterer/meterer_test.go index 9e68d1da80..758e893116 100644 --- a/core/meterer/meterer_test.go +++ b/core/meterer/meterer_test.go @@ -44,20 +44,6 @@ func TestMain(m *testing.M) { os.Exit(code) } -// // Mock data initialization method -// func InitializeMockPayments(pcs *meterer.OnchainPaymentState, privateKey1 *ecdsa.PrivateKey, privateKey2 *ecdsa.PrivateKey) { -// // Initialize mock active reservations -// now := uint64(time.Now().Unix()) -// pcs.ActiveReservations = map[string]core.ActiveReservation{ -// crypto.PubkeyToAddress(privateKey1.PublicKey).Hex(): {DataRate: 100, StartTimestamp: now + 1200, EndTimestamp: now + 1800, QuorumSplit: []byte{50, 50}, QuorumNumbers: []uint8{0, 1}}, -// crypto.PubkeyToAddress(privateKey2.PublicKey).Hex(): {DataRate: 200, StartTimestamp: now - 120, EndTimestamp: now + 180, QuorumSplit: []byte{30, 70}, QuorumNumbers: []uint8{0, 1}}, -// } -// pcs.OnDemandPayments = map[string]core.OnDemandPayment{ -// crypto.PubkeyToAddress(privateKey1.PublicKey).Hex(): {CumulativePayment: 1500}, -// crypto.PubkeyToAddress(privateKey2.PublicKey).Hex(): {CumulativePayment: 1000}, -// } -// } - func setup(_ *testing.M) { deployLocalStack = !(os.Getenv("DEPLOY_LOCALSTACK") == "false") @@ -117,6 +103,10 @@ func setup(_ *testing.M) { EndpointURL: fmt.Sprintf("http://0.0.0.0:4566"), } + meterer.CreateReservationTable(clientConfig, "reservations") + meterer.CreateOnDemandTable(clientConfig, "ondemand") + meterer.CreateGlobalReservationTable(clientConfig, "global") + store, err := meterer.NewOffchainStore( clientConfig, "reservations", @@ -124,6 +114,7 @@ func setup(_ *testing.M) { "global", logger, ) + if err != nil { teardown() panic("failed to create offchain store") diff --git a/core/mock/onchain_state.go b/core/mock/payment_state.go similarity index 100% rename from core/mock/onchain_state.go rename to core/mock/payment_state.go