Skip to content

Commit

Permalink
refactor: reader casting
Browse files Browse the repository at this point in the history
  • Loading branch information
@hopeyen
hopeyen committed Feb 26, 2025
1 parent 94b1722 commit ed06e20
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions core/eth/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,8 @@ func (t *Reader) GetVersionedBlobParams(ctx context.Context, blobVersion uint16)
}
return &core.BlobVersionParameters{
CodingRate: uint32(params.CodingRate),
NumChunks: uint32(params.NumChunks),
MaxNumOperators: uint32(params.MaxNumOperators),
NumChunks: params.NumChunks,
MaxNumOperators: params.MaxNumOperators,
}, nil
}

Expand Down
32 changes: 16 additions & 16 deletions core/meterer/meterer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ func teardown() {

func TestMetererReservations(t *testing.T) {
ctx := context.Background()
paymentChainState.On("GetReservationWindow", testifymock.Anything).Return(uint32(5), nil)
paymentChainState.On("GetReservationWindow", testifymock.Anything).Return(uint64(5), nil)
paymentChainState.On("GetGlobalSymbolsPerSecond", testifymock.Anything).Return(uint64(1009), nil)
paymentChainState.On("GetGlobalRatePeriodInterval", testifymock.Anything).Return(uint32(1), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint32(3), nil)
paymentChainState.On("GetGlobalRatePeriodInterval", testifymock.Anything).Return(uint64(1), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint64(3), nil)

now := time.Now().UnixNano()
reservationPeriod := meterer.GetReservationPeriodByNanosecond(now, mt.ChainPaymentState.GetReservationWindow())
Expand Down Expand Up @@ -250,7 +250,7 @@ func TestMetererReservations(t *testing.T) {
"ReservationPeriod": &types.AttributeValueMemberN{Value: strconv.Itoa(int(reservationPeriod))},
})
assert.NoError(t, err)
assert.Equal(t, uint32(requiredLength), symbolsCharged)
assert.Equal(t, uint64(requiredLength), symbolsCharged)
assert.Equal(t, accountID2.Hex(), item["AccountID"].(*types.AttributeValueMemberS).Value)
assert.Equal(t, strconv.Itoa(int(reservationPeriod)), item["ReservationPeriod"].(*types.AttributeValueMemberN).Value)
assert.Equal(t, strconv.Itoa((i+1)*int(requiredLength)), item["BinUsage"].(*types.AttributeValueMemberN).Value)
Expand All @@ -259,7 +259,7 @@ func TestMetererReservations(t *testing.T) {
header = createPaymentHeader(now, big.NewInt(0), accountID2)
symbolsCharged, err := mt.MeterRequest(ctx, *header, 25, quoromNumbers)
assert.NoError(t, err)
assert.Equal(t, uint32(27), symbolsCharged)
assert.Equal(t, uint64(27), symbolsCharged)
overflowedReservationPeriod := reservationPeriod + 2
item, err := dynamoClient.GetItem(ctx, reservationTableName, commondynamodb.Key{
"AccountID": &types.AttributeValueMemberS{Value: accountID2.Hex()},
Expand All @@ -281,8 +281,8 @@ func TestMetererReservations(t *testing.T) {
func TestMetererOnDemand(t *testing.T) {
ctx := context.Background()
quorumNumbers := []uint8{0, 1}
paymentChainState.On("GetPricePerSymbol", testifymock.Anything).Return(uint32(2), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint32(3), nil)
paymentChainState.On("GetPricePerSymbol", testifymock.Anything).Return(uint64(2), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint64(3), nil)
now := time.Now().Unix()

paymentChainState.On("GetOnDemandPaymentByAccount", testifymock.Anything, testifymock.MatchedBy(func(account gethcommon.Address) bool {
Expand Down Expand Up @@ -328,7 +328,7 @@ func TestMetererOnDemand(t *testing.T) {
header = createPaymentHeader(now, priceCharged, accountID2)
symbolsCharged, err := mt.MeterRequest(ctx, *header, symbolLength, quorumNumbers)
assert.NoError(t, err)
assert.Equal(t, uint32(102), symbolsCharged)
assert.Equal(t, uint64(102), symbolsCharged)
header = createPaymentHeader(now, priceCharged, accountID2)
_, err = mt.MeterRequest(ctx, *header, symbolLength, quorumNumbers)
assert.ErrorContains(t, err, "exact payment already exists")
Expand All @@ -339,7 +339,7 @@ func TestMetererOnDemand(t *testing.T) {
header = createPaymentHeader(now, new(big.Int).Mul(priceCharged, big.NewInt(int64(i+1))), accountID2)
symbolsCharged, err = mt.MeterRequest(ctx, *header, symbolLength, quorumNumbers)
assert.NoError(t, err)
assert.Equal(t, uint32(102), symbolsCharged)
assert.Equal(t, uint64(102), symbolsCharged)
}

// test cumulative payment on-chain constraint
Expand Down Expand Up @@ -384,8 +384,8 @@ func TestMeterer_paymentCharged(t *testing.T) {
tests := []struct {
name string
symbolLength uint64
pricePerSymbol uint32
minNumSymbols uint32
pricePerSymbol uint64
minNumSymbols uint64
expected *big.Int
}{
{
Expand Down Expand Up @@ -427,8 +427,8 @@ func TestMeterer_paymentCharged(t *testing.T) {

paymentChainState := &mock.MockOnchainPaymentState{}
for _, tt := range tests {
paymentChainState.On("GetPricePerSymbol", testifymock.Anything).Return(uint32(tt.pricePerSymbol), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint32(tt.minNumSymbols), nil)
paymentChainState.On("GetPricePerSymbol", testifymock.Anything).Return(uint64(tt.pricePerSymbol), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint64(tt.minNumSymbols), nil)
t.Run(tt.name, func(t *testing.T) {
m := &meterer.Meterer{
ChainPaymentState: paymentChainState,
Expand All @@ -443,8 +443,8 @@ func TestMeterer_symbolsCharged(t *testing.T) {
tests := []struct {
name string
symbolLength uint64
minNumSymbols uint32
expected uint32
minNumSymbols uint64
expected uint64
}{
{
name: "Data length equal to min number of symobols",
Expand Down Expand Up @@ -480,7 +480,7 @@ func TestMeterer_symbolsCharged(t *testing.T) {

paymentChainState := &mock.MockOnchainPaymentState{}
for _, tt := range tests {
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint32(tt.minNumSymbols), nil)
paymentChainState.On("GetMinNumSymbols", testifymock.Anything).Return(uint64(tt.minNumSymbols), nil)
t.Run(tt.name, func(t *testing.T) {
m := &meterer.Meterer{
ChainPaymentState: paymentChainState,
Expand Down
8 changes: 4 additions & 4 deletions disperser/apiserver/server_v2_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,11 +455,11 @@ func newTestServerV2(t *testing.T) *testComponents {
// append test name to each table name for an unique store
mockState := &mock.MockOnchainPaymentState{}
mockState.On("RefreshOnchainPaymentState", tmock.Anything).Return(nil).Maybe()
mockState.On("GetReservationWindow", tmock.Anything).Return(uint32(1), nil)
mockState.On("GetPricePerSymbol", tmock.Anything).Return(uint32(2), nil)
mockState.On("GetReservationWindow", tmock.Anything).Return(uint64(1), nil)
mockState.On("GetPricePerSymbol", tmock.Anything).Return(uint64(2), nil)
mockState.On("GetGlobalSymbolsPerSecond", tmock.Anything).Return(uint64(1009), nil)
mockState.On("GetGlobalRatePeriodInterval", tmock.Anything).Return(uint32(1), nil)
mockState.On("GetMinNumSymbols", tmock.Anything).Return(uint32(3), nil)
mockState.On("GetGlobalRatePeriodInterval", tmock.Anything).Return(uint64(1), nil)
mockState.On("GetMinNumSymbols", tmock.Anything).Return(uint64(3), nil)

now := uint64(time.Now().Unix())
mockState.On("GetReservedPaymentByAccount", tmock.Anything, tmock.Anything).Return(&core.ReservedPayment{SymbolsPerSecond: 100, StartTimestamp: now + 1200, EndTimestamp: now + 1800, QuorumSplits: []byte{50, 50}, QuorumNumbers: []uint8{0, 1}}, nil)
Expand Down

0 comments on commit ed06e20

Please sign in to comment.