diff --git a/core/data.go b/core/data.go index ef7e6cdbfa..9a1d27a779 100644 --- a/core/data.go +++ b/core/data.go @@ -520,8 +520,8 @@ type ActiveReservation struct { StartTimestamp uint64 // Unix timestamp that's valid for basically eternity EndTimestamp uint64 - QuorumNumbers []uint8 - QuorumSplit []byte // ordered mapping of quorum number to payment split; on-chain validation should ensure split <= 100 + QuorumNumbers []uint8 // allowed quorums + QuorumSplit []byte // ordered mapping of quorum number to payment split; on-chain validation should ensure split <= 100 } type OnDemandPayment struct { diff --git a/core/meterer/meterer.go b/core/meterer/meterer.go index 096315117b..4e619e1d4f 100644 --- a/core/meterer/meterer.go +++ b/core/meterer/meterer.go @@ -219,7 +219,7 @@ func (m *Meterer) ServeOnDemandRequest(ctx context.Context, header core.PaymentM // <= PaymentMetadata.CumulativePayment // <= nextPmt - nextPmtDataLength * m.FixedFeePerByte > nextPmt func (m *Meterer) ValidatePayment(ctx context.Context, header core.PaymentMetadata, onDemandPayment *core.OnDemandPayment, blobLength uint) error { - if header.CumulativePayment.Cmp(&onDemandPayment.CumulativePayment) > 0 { + if header.CumulativePayment.Cmp(onDemandPayment.CumulativePayment) > 0 { return fmt.Errorf("request claims a cumulative payment greater than the on-chain deposit") } diff --git a/core/meterer/meterer_test.go b/core/meterer/meterer_test.go index 79c3553587..8fa69a52ca 100644 --- a/core/meterer/meterer_test.go +++ b/core/meterer/meterer_test.go @@ -132,8 +132,8 @@ func setup(_ *testing.M) { accountID2 = crypto.PubkeyToAddress(privateKey2.PublicKey).Hex() account1Reservations = core.ActiveReservation{SymbolsPerSec: 100, StartTimestamp: now + 1200, EndTimestamp: now + 1800, QuorumSplit: []byte{50, 50}, QuorumNumbers: []uint8{0, 1}} account2Reservations = core.ActiveReservation{SymbolsPerSec: 200, StartTimestamp: now - 120, EndTimestamp: now + 180, QuorumSplit: []byte{30, 70}, QuorumNumbers: []uint8{0, 1}} - account1OnDemandPayments = core.OnDemandPayment{CumulativePayment: *big.NewInt(3864)} - account2OnDemandPayments = core.OnDemandPayment{CumulativePayment: *big.NewInt(2000)} + account1OnDemandPayments = core.OnDemandPayment{CumulativePayment: big.NewInt(3864)} + account2OnDemandPayments = core.OnDemandPayment{CumulativePayment: big.NewInt(2000)} store, err := meterer.NewOffchainStore( clientConfig,