chore: remove unrelevant changes

Author: hopeyen

disperser/apiserver/server_test.go

@@ -754,21 +754,19 @@ func newTestServer(transactor core.Writer, testName string) *apiserver.Dispersal
 
 	mockState.On("GetPricePerSymbol").Return(uint32(encoding.BYTES_PER_SYMBOL), nil)
 	mockState.On("GetMinNumSymbols").Return(uint32(1), nil)
-	mockState.On("GetOnDemandGlobalSymbolsPerSecond").Return(uint64(4096), nil)
+	mockState.On("GetGlobalSymbolsPerSecond").Return(uint64(4096), nil)
 	mockState.On("GetRequiredQuorumNumbers").Return([]uint8{0, 1}, nil)
 	mockState.On("GetOnDemandQuorumNumbers").Return([]uint8{0, 1}, nil)
 	mockState.On("GetReservationWindow").Return(uint32(1), nil)
 	mockState.On("GetOnDemandPaymentByAccount", tmock.Anything, tmock.Anything).Return(&core.OnDemandPayment{
 		CumulativePayment: big.NewInt(3000),
 	}, nil)
-	mockState.On("GetReservedPaymentByAccountAndQuorums", tmock.Anything, tmock.Anything, tmock.Anything).Return(map[uint8]*core.ReservedPayment{
-		0: {SymbolsPerSecond: 2048, StartTimestamp: 0, EndTimestamp: math.MaxUint32},
-		1: {SymbolsPerSecond: 2048, StartTimestamp: 0, EndTimestamp: math.MaxUint32},
-	}, nil)
 	mockState.On("GetReservedPaymentByAccount", tmock.Anything, tmock.Anything).Return(&core.ReservedPayment{
 		SymbolsPerSecond: 2048,
 		StartTimestamp:   0,
 		EndTimestamp:     math.MaxUint32,
+		QuorumNumbers:    []uint8{0, 1},
+		QuorumSplits:     []byte{50, 50},
 	}, nil)
 	// append test name to each table name for an unique store
 	table_names := []string{"reservations_server_" + testName, "ondemand_server_" + testName, "global_server_" + testName}

disperser/apiserver/server_v2.go

@@ -368,6 +368,7 @@ func (s *DispersalServerV2) GetPaymentState(ctx context.Context, req *pb.GetPaym
 	return reply, nil
 }
 
+// TODO(hopeyen): separate this into a subsequent PR
 func (s *DispersalServerV2) GetQuorumSpecificPaymentState(ctx context.Context, req *pb.GetQuorumSpecificPaymentStateRequest) (*pb.GetQuorumSpecificPaymentStateReply, error) {
 	return nil, api.NewErrorUnimplemented()
 }

disperser/apiserver/server_v2_test.go

@@ -518,16 +518,12 @@ func newTestServerV2(t *testing.T) *testComponents {
 	mockState.On("RefreshOnchainPaymentState", tmock.Anything).Return(nil).Maybe()
 	mockState.On("GetReservationWindow", tmock.Anything).Return(uint64(1), nil)
 	mockState.On("GetPricePerSymbol", tmock.Anything).Return(uint64(2), nil)
-	mockState.On("GetOnDemandGlobalSymbolsPerSecond", tmock.Anything).Return(uint64(1009), nil)
+	mockState.On("GetGlobalSymbolsPerSecond", tmock.Anything).Return(uint64(1009), nil)
 	mockState.On("GetGlobalRatePeriodInterval", tmock.Anything).Return(uint64(1), nil)
-	mockState.On("GetOnDemandGlobalRatePeriodInterval", tmock.Anything).Return(uint64(1), nil)
 	mockState.On("GetMinNumSymbols", tmock.Anything).Return(uint64(3), nil)
 
 	now := uint64(time.Now().Unix())
-	mockState.On("GetReservedPaymentByAccountAndQuorums", tmock.Anything, tmock.Anything, tmock.Anything).Return(map[uint8]*core.ReservedPayment{
-		0: {SymbolsPerSecond: 100, StartTimestamp: now + 1200, EndTimestamp: now + 1800},
-		1: {SymbolsPerSecond: 100, StartTimestamp: now + 1200, EndTimestamp: now + 1800},
-	}, nil)
+	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)
 	mockState.On("GetOnDemandPaymentByAccount", tmock.Anything, tmock.Anything).Return(&core.OnDemandPayment{CumulativePayment: big.NewInt(3864)}, nil)
 	mockState.On("GetOnDemandQuorumNumbers", tmock.Anything).Return([]uint8{0, 1}, nil)