diff --git a/multinode/console/controllers/payouts.go b/multinode/console/controllers/payouts.go index e4e8175ea..f6635e036 100644 --- a/multinode/console/controllers/payouts.go +++ b/multinode/console/controllers/payouts.go @@ -35,13 +35,13 @@ func NewPayouts(log *zap.Logger, service *payouts.Service) *Payouts { } } -// GetAllNodesTotalEarned handles retrieval total earned amount . -func (controller *Payouts) GetAllNodesTotalEarned(w http.ResponseWriter, r *http.Request) { +// Earned handles retrieval total earned amount . +func (controller *Payouts) Earned(w http.ResponseWriter, r *http.Request) { ctx := r.Context() var err error defer mon.Task()(&ctx)(&err) - earned, err := controller.service.GetAllNodesAllTimeEarned(ctx) + earned, err := controller.service.Earned(ctx) if err != nil { controller.log.Error("all node total earned internal error", zap.Error(err)) controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) @@ -107,8 +107,8 @@ func (controller *Payouts) Expectations(w http.ResponseWriter, r *http.Request) } } -// PeriodSummary handles retrieval from nodes for specific period. -func (controller *Payouts) PeriodSummary(w http.ResponseWriter, r *http.Request) { +// SummaryPeriod handles retrieval from nodes for specific period. +func (controller *Payouts) SummaryPeriod(w http.ResponseWriter, r *http.Request) { ctx := r.Context() var err error defer mon.Task()(&ctx)(&err) @@ -122,7 +122,7 @@ func (controller *Payouts) PeriodSummary(w http.ResponseWriter, r *http.Request) return } - summary, err := controller.service.NodesPeriodSummary(ctx, period) + summary, err := controller.service.SummaryPeriod(ctx, period) if err != nil { controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) return @@ -142,7 +142,7 @@ func (controller *Payouts) Summary(w http.ResponseWriter, r *http.Request) { w.Header().Add("Content-Type", "application/json") - summary, err := controller.service.NodesSummary(ctx) + summary, err := controller.service.Summary(ctx) if err != nil { controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) return @@ -154,8 +154,8 @@ func (controller *Payouts) Summary(w http.ResponseWriter, r *http.Request) { } } -// SatellitePeriodSummary handles retrieval from nodes from specific satellite for specific period. -func (controller *Payouts) SatellitePeriodSummary(w http.ResponseWriter, r *http.Request) { +// SummarySatellitePeriod handles retrieval from nodes from specific satellite for specific period. +func (controller *Payouts) SummarySatellitePeriod(w http.ResponseWriter, r *http.Request) { ctx := r.Context() var err error defer mon.Task()(&ctx)(&err) @@ -171,7 +171,7 @@ func (controller *Payouts) SatellitePeriodSummary(w http.ResponseWriter, r *http id, ok := segmentParams["id"] if !ok { - controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable id")) + controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable satellite id")) return } @@ -181,7 +181,7 @@ func (controller *Payouts) SatellitePeriodSummary(w http.ResponseWriter, r *http return } - summary, err := controller.service.NodesSatellitePeriodSummary(ctx, satelliteID, period) + summary, err := controller.service.SummarySatellitePeriod(ctx, satelliteID, period) if err != nil { controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) return @@ -193,8 +193,8 @@ func (controller *Payouts) SatellitePeriodSummary(w http.ResponseWriter, r *http } } -// SatelliteSummary handles retrieval from nodes from specific satellite. -func (controller *Payouts) SatelliteSummary(w http.ResponseWriter, r *http.Request) { +// SummarySatellite handles retrieval from nodes from specific satellite. +func (controller *Payouts) SummarySatellite(w http.ResponseWriter, r *http.Request) { ctx := r.Context() var err error defer mon.Task()(&ctx)(&err) @@ -204,7 +204,7 @@ func (controller *Payouts) SatelliteSummary(w http.ResponseWriter, r *http.Reque id, ok := segmentParams["id"] if !ok { - controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable id")) + controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable satellite id")) return } @@ -214,7 +214,7 @@ func (controller *Payouts) SatelliteSummary(w http.ResponseWriter, r *http.Reque return } - summary, err := controller.service.NodesSatelliteSummary(ctx, satelliteID) + summary, err := controller.service.SummarySatellite(ctx, satelliteID) if err != nil { controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) return @@ -259,8 +259,8 @@ func (controller *Payouts) Paystub(w http.ResponseWriter, r *http.Request) { } } -// SatellitePaystub returns all summed paystubs from specific satellite. -func (controller *Payouts) SatellitePaystub(w http.ResponseWriter, r *http.Request) { +// PaystubSatellite returns all summed paystubs from specific satellite. +func (controller *Payouts) PaystubSatellite(w http.ResponseWriter, r *http.Request) { ctx := r.Context() var err error defer mon.Task()(&ctx)(&err) @@ -270,7 +270,7 @@ func (controller *Payouts) SatellitePaystub(w http.ResponseWriter, r *http.Reque id, ok := segmentParams["id"] if !ok { - controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable id")) + controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable satellite id")) return } @@ -292,7 +292,7 @@ func (controller *Payouts) SatellitePaystub(w http.ResponseWriter, r *http.Reque return } - paystub, err := controller.service.SatellitePaystub(ctx, nodeID, satelliteID) + paystub, err := controller.service.PaystubSatellite(ctx, nodeID, satelliteID) if err != nil { controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) return @@ -304,8 +304,8 @@ func (controller *Payouts) SatellitePaystub(w http.ResponseWriter, r *http.Reque } } -// SatellitePaystubPeriod returns satellite summed paystubs for period. -func (controller *Payouts) SatellitePaystubPeriod(w http.ResponseWriter, r *http.Request) { +// PaystubSatellitePeriod returns satellite summed paystubs for period. +func (controller *Payouts) PaystubSatellitePeriod(w http.ResponseWriter, r *http.Request) { ctx := r.Context() var err error defer mon.Task()(&ctx)(&err) @@ -315,7 +315,7 @@ func (controller *Payouts) SatellitePaystubPeriod(w http.ResponseWriter, r *http id, ok := segmentParams["id"] if !ok { - controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable id")) + controller.serveError(w, http.StatusBadRequest, ErrPayouts.New("couldn't receive route variable satellite id")) return } @@ -343,7 +343,7 @@ func (controller *Payouts) SatellitePaystubPeriod(w http.ResponseWriter, r *http return } - paystub, err := controller.service.SatellitePaystubPeriod(ctx, period, nodeID, satelliteID) + paystub, err := controller.service.PaystubSatellitePeriod(ctx, period, nodeID, satelliteID) if err != nil { controller.serveError(w, http.StatusInternalServerError, ErrPayouts.Wrap(err)) return diff --git a/multinode/console/server/server.go b/multinode/console/server/server.go index 8c646bcee..40ebb9c85 100644 --- a/multinode/console/server/server.go +++ b/multinode/console/server/server.go @@ -76,17 +76,17 @@ func NewServer(log *zap.Logger, config Config, nodes *nodes.Service, payouts *pa payoutsController := controllers.NewPayouts(server.log, server.payouts) payoutsRouter := apiRouter.PathPrefix("/payouts").Subrouter() payoutsRouter.HandleFunc("/summaries", payoutsController.Summary).Methods(http.MethodGet) - payoutsRouter.HandleFunc("/summaries/{period}", payoutsController.PeriodSummary).Methods(http.MethodGet) + payoutsRouter.HandleFunc("/summaries/{period}", payoutsController.SummaryPeriod).Methods(http.MethodGet) payoutsRouter.HandleFunc("/expectations", payoutsController.Expectations).Methods(http.MethodGet) payoutsRouter.HandleFunc("/expectations/{nodeID}", payoutsController.NodeExpectations).Methods(http.MethodGet) payoutsRouter.HandleFunc("/paystubs/{nodeID}", payoutsController.Paystub).Methods(http.MethodGet) payoutsRouter.HandleFunc("/paystubs/{period}/{nodeID}", payoutsController.PaystubPeriod).Methods(http.MethodGet) - payoutsRouter.HandleFunc("/total-earned", payoutsController.GetAllNodesTotalEarned).Methods(http.MethodGet) + payoutsRouter.HandleFunc("/total-earned", payoutsController.Earned).Methods(http.MethodGet) payoutsRouter.HandleFunc("/held-amounts/{nodeID}", payoutsController.HeldAmountSummary).Methods(http.MethodGet) - payoutsRouter.HandleFunc("/satellites/{id}/summaries", payoutsController.SatelliteSummary).Methods(http.MethodGet) - payoutsRouter.HandleFunc("/satellites/{id}/summaries/{period}", payoutsController.SatellitePeriodSummary).Methods(http.MethodGet) - payoutsRouter.HandleFunc("/satellites/{id}/paystubs/{nodeID}", payoutsController.SatellitePaystub).Methods(http.MethodGet) - payoutsRouter.HandleFunc("/satellites/{id}/paystubs/{period}/{nodeID}", payoutsController.SatellitePaystubPeriod).Methods(http.MethodGet) + payoutsRouter.HandleFunc("/satellites/{id}/summaries", payoutsController.SummarySatellite).Methods(http.MethodGet) + payoutsRouter.HandleFunc("/satellites/{id}/summaries/{period}", payoutsController.SummarySatellitePeriod).Methods(http.MethodGet) + payoutsRouter.HandleFunc("/satellites/{id}/paystubs/{nodeID}", payoutsController.PaystubSatellite).Methods(http.MethodGet) + payoutsRouter.HandleFunc("/satellites/{id}/paystubs/{period}/{nodeID}", payoutsController.PaystubSatellitePeriod).Methods(http.MethodGet) if server.config.StaticDir != "" { router.PathPrefix("/static/").Handler(http.StripPrefix("/static", fs)) diff --git a/multinode/nodes/service.go b/multinode/nodes/service.go index 9dd4863c1..9d62b2b9e 100644 --- a/multinode/nodes/service.go +++ b/multinode/nodes/service.go @@ -102,7 +102,7 @@ func (service *Service) ListInfos(ctx context.Context) (_ []NodeInfo, err error) nodeClient := multinodepb.NewDRPCNodeClient(conn) storageClient := multinodepb.NewDRPCStorageClient(conn) bandwidthClient := multinodepb.NewDRPCBandwidthClient(conn) - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, @@ -185,7 +185,7 @@ func (service *Service) ListInfosSatellite(ctx context.Context, satelliteID stor }() nodeClient := multinodepb.NewDRPCNodeClient(conn) - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, diff --git a/multinode/payouts/service.go b/multinode/payouts/service.go index cbce21bd8..e9ce48d7b 100644 --- a/multinode/payouts/service.go +++ b/multinode/payouts/service.go @@ -41,8 +41,8 @@ func NewService(log *zap.Logger, dialer rpc.Dialer, nodes nodes.DB) *Service { } } -// GetAllNodesAllTimeEarned retrieves all nodes earned amount for all time. -func (service *Service) GetAllNodesAllTimeEarned(ctx context.Context) (earned int64, err error) { +// Earned retrieves all nodes earned amount for all time. +func (service *Service) Earned(ctx context.Context) (earned int64, err error) { defer mon.Task()(&ctx)(&err) storageNodes, err := service.nodes.List(ctx) @@ -51,7 +51,7 @@ func (service *Service) GetAllNodesAllTimeEarned(ctx context.Context) (earned in } for _, node := range storageNodes { - amount, err := service.getAmount(ctx, node) + amount, err := service.earned(ctx, node) if err != nil { service.log.Error("failed to getAmount", zap.Error(err)) continue @@ -63,8 +63,8 @@ func (service *Service) GetAllNodesAllTimeEarned(ctx context.Context) (earned in return earned, nil } -// GetAllNodesEarnedOnSatellite retrieves all nodes earned amount for all time per satellite. -func (service *Service) GetAllNodesEarnedOnSatellite(ctx context.Context) (earned []SatelliteSummary, err error) { +// EarnedSatellite retrieves all nodes earned amount for all time per satellite. +func (service *Service) EarnedSatellite(ctx context.Context) (earned []SatelliteSummary, err error) { defer mon.Task()(&ctx)(&err) storageNodes, err := service.nodes.List(ctx) @@ -73,10 +73,10 @@ func (service *Service) GetAllNodesEarnedOnSatellite(ctx context.Context) (earne } var listSatellites storj.NodeIDList - var listNodesEarnedPerSatellite []multinodepb.EarnedPerSatelliteResponse + var listNodesEarnedPerSatellite []multinodepb.EarnedSatelliteResponse for _, node := range storageNodes { - earnedPerSatellite, err := service.getEarnedOnSatellite(ctx, node) + earnedPerSatellite, err := service.earnedSatellite(ctx, node) if err != nil { service.log.Error("failed to getEarnedFromSatellite", zap.Error(err)) continue @@ -113,8 +113,8 @@ func (service *Service) GetAllNodesEarnedOnSatellite(ctx context.Context) (earne return earned, nil } -// NodesSummary returns all satellites all time stats. -func (service *Service) NodesSummary(ctx context.Context) (_ Summary, err error) { +// Summary returns all satellites all time stats. +func (service *Service) Summary(ctx context.Context) (_ Summary, err error) { defer mon.Task()(&ctx)(&err) var summary Summary @@ -125,7 +125,7 @@ func (service *Service) NodesSummary(ctx context.Context) (_ Summary, err error) } for _, node := range list { - info, err := service.getAllSatellitesAllTime(ctx, node) + info, err := service.summary(ctx, node) if err != nil { return Summary{}, Error.Wrap(err) } @@ -136,8 +136,8 @@ func (service *Service) NodesSummary(ctx context.Context) (_ Summary, err error) return summary, nil } -// NodesPeriodSummary returns all satellites stats for specific period. -func (service *Service) NodesPeriodSummary(ctx context.Context, period string) (_ Summary, err error) { +// SummaryPeriod returns all satellites stats for specific period. +func (service *Service) SummaryPeriod(ctx context.Context, period string) (_ Summary, err error) { defer mon.Task()(&ctx)(&err) var summary Summary @@ -148,7 +148,7 @@ func (service *Service) NodesPeriodSummary(ctx context.Context, period string) ( } for _, node := range list { - info, err := service.getAllSatellitesPeriod(ctx, node, period) + info, err := service.summaryPeriod(ctx, node, period) if err != nil { return Summary{}, Error.Wrap(err) } @@ -159,8 +159,8 @@ func (service *Service) NodesPeriodSummary(ctx context.Context, period string) ( return summary, nil } -// NodesSatelliteSummary returns specific satellite all time stats. -func (service *Service) NodesSatelliteSummary(ctx context.Context, satelliteID storj.NodeID) (_ Summary, err error) { +// SummarySatellite returns specific satellite all time stats. +func (service *Service) SummarySatellite(ctx context.Context, satelliteID storj.NodeID) (_ Summary, err error) { defer mon.Task()(&ctx)(&err) var summary Summary @@ -170,7 +170,7 @@ func (service *Service) NodesSatelliteSummary(ctx context.Context, satelliteID s } for _, node := range list { - info, err := service.nodeSatelliteSummary(ctx, node, satelliteID) + info, err := service.summarySatellite(ctx, node, satelliteID) if err != nil { return Summary{}, Error.Wrap(err) } @@ -181,8 +181,8 @@ func (service *Service) NodesSatelliteSummary(ctx context.Context, satelliteID s return summary, nil } -// NodesSatellitePeriodSummary returns specific satellite stats for specific period. -func (service *Service) NodesSatellitePeriodSummary(ctx context.Context, satelliteID storj.NodeID, period string) (_ Summary, err error) { +// SummarySatellitePeriod returns specific satellite stats for specific period. +func (service *Service) SummarySatellitePeriod(ctx context.Context, satelliteID storj.NodeID, period string) (_ Summary, err error) { defer mon.Task()(&ctx)(&err) var summary Summary @@ -192,7 +192,7 @@ func (service *Service) NodesSatellitePeriodSummary(ctx context.Context, satelli } for _, node := range list { - info, err := service.nodeSatellitePeriodSummary(ctx, node, satelliteID, period) + info, err := service.summarySatellitePeriod(ctx, node, satelliteID, period) if err != nil { return Summary{}, Error.Wrap(err) } @@ -203,8 +203,8 @@ func (service *Service) NodesSatellitePeriodSummary(ctx context.Context, satelli return summary, nil } -// nodeSatelliteSummary returns payout info for single satellite, for specific node. -func (service *Service) nodeSatelliteSummary(ctx context.Context, node nodes.Node, satelliteID storj.NodeID) (info *multinodepb.PayoutInfo, err error) { +// summarySatellite returns payout info for single satellite, for specific node. +func (service *Service) summarySatellite(ctx context.Context, node nodes.Node, satelliteID storj.NodeID) (info *multinodepb.PayoutInfo, err error) { conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{ ID: node.ID, Address: node.PublicAddress, @@ -217,12 +217,12 @@ func (service *Service) nodeSatelliteSummary(ctx context.Context, node nodes.Nod err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.SatelliteSummary(ctx, &multinodepb.SatelliteSummaryRequest{Header: header, SatelliteId: satelliteID}) + response, err := payoutClient.SummarySatellite(ctx, &multinodepb.SummarySatelliteRequest{Header: header, SatelliteId: satelliteID}) if err != nil { return &multinodepb.PayoutInfo{}, Error.Wrap(err) } @@ -230,8 +230,8 @@ func (service *Service) nodeSatelliteSummary(ctx context.Context, node nodes.Nod return response.PayoutInfo, nil } -// nodeSatellitePeriodSummary returns satellite payout info for specific node for specific period. -func (service *Service) nodeSatellitePeriodSummary(ctx context.Context, node nodes.Node, satelliteID storj.NodeID, period string) (info *multinodepb.PayoutInfo, err error) { +// summarySatellitePeriod returns satellite payout info for specific node for specific period. +func (service *Service) summarySatellitePeriod(ctx context.Context, node nodes.Node, satelliteID storj.NodeID, period string) (info *multinodepb.PayoutInfo, err error) { conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{ ID: node.ID, Address: node.PublicAddress, @@ -244,12 +244,12 @@ func (service *Service) nodeSatellitePeriodSummary(ctx context.Context, node nod err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.SatellitePeriodSummary(ctx, &multinodepb.SatellitePeriodSummaryRequest{Header: header, SatelliteId: satelliteID, Period: period}) + response, err := payoutClient.SummarySatellitePeriod(ctx, &multinodepb.SummarySatellitePeriodRequest{Header: header, SatelliteId: satelliteID, Period: period}) if err != nil { return &multinodepb.PayoutInfo{}, Error.Wrap(err) } @@ -257,7 +257,8 @@ func (service *Service) nodeSatellitePeriodSummary(ctx context.Context, node nod return response.PayoutInfo, nil } -func (service *Service) getAllSatellitesPeriod(ctx context.Context, node nodes.Node, period string) (info *multinodepb.PayoutInfo, err error) { +// summaryPeriod returns node's payout info for specific period. +func (service *Service) summaryPeriod(ctx context.Context, node nodes.Node, period string) (info *multinodepb.PayoutInfo, err error) { conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{ ID: node.ID, Address: node.PublicAddress, @@ -270,12 +271,12 @@ func (service *Service) getAllSatellitesPeriod(ctx context.Context, node nodes.N err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.AllSatellitesPeriodSummary(ctx, &multinodepb.AllSatellitesPeriodSummaryRequest{Header: header, Period: period}) + response, err := payoutClient.SummaryPeriod(ctx, &multinodepb.SummaryPeriodRequest{Header: header, Period: period}) if err != nil { return &multinodepb.PayoutInfo{}, Error.Wrap(err) } @@ -283,7 +284,8 @@ func (service *Service) getAllSatellitesPeriod(ctx context.Context, node nodes.N return response.PayoutInfo, nil } -func (service *Service) getAllSatellitesAllTime(ctx context.Context, node nodes.Node) (info *multinodepb.PayoutInfo, err error) { +// summary returns node's total payout info. +func (service *Service) summary(ctx context.Context, node nodes.Node) (info *multinodepb.PayoutInfo, err error) { conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{ ID: node.ID, Address: node.PublicAddress, @@ -296,12 +298,12 @@ func (service *Service) getAllSatellitesAllTime(ctx context.Context, node nodes. err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.AllSatellitesSummary(ctx, &multinodepb.AllSatellitesSummaryRequest{Header: header}) + response, err := payoutClient.Summary(ctx, &multinodepb.SummaryRequest{Header: header}) if err != nil { return &multinodepb.PayoutInfo{}, Error.Wrap(err) } @@ -431,7 +433,7 @@ func (service *Service) HeldAmountSummary(ctx context.Context, nodeID storj.Node // heldAmountHistory retrieves held amount history for a particular node. func (service *Service) heldAmountHistory(ctx context.Context, node nodes.Node, conn drpc.Conn) (_ []HeldAmountHistory, err error) { defer mon.Task()(&ctx)(&err) - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, @@ -477,12 +479,12 @@ func (service *Service) nodeExpectations(ctx context.Context, node nodes.Node) ( err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - estimated, err := payoutClient.EstimatedPayoutTotal(ctx, &multinodepb.EstimatedPayoutTotalRequest{Header: header}) + estimated, err := payoutClient.EstimatedPayout(ctx, &multinodepb.EstimatedPayoutRequest{Header: header}) if err != nil { return Expectations{}, Error.Wrap(err) } @@ -495,8 +497,8 @@ func (service *Service) nodeExpectations(ctx context.Context, node nodes.Node) ( return Expectations{Undistributed: undistributed.Total, CurrentMonthEstimation: estimated.EstimatedEarnings}, nil } -// getAmount returns earned from node. -func (service *Service) getAmount(ctx context.Context, node nodes.Node) (_ int64, err error) { +// earned returns earned from node. +func (service *Service) earned(ctx context.Context, node nodes.Node) (_ int64, err error) { conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{ ID: node.ID, Address: node.PublicAddress, @@ -509,7 +511,7 @@ func (service *Service) getAmount(ctx context.Context, node nodes.Node) (_ int64 err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } @@ -522,35 +524,35 @@ func (service *Service) getAmount(ctx context.Context, node nodes.Node) (_ int64 return amount.Total, nil } -// getEarnedOnSatellite returns earned split by satellites. -func (service *Service) getEarnedOnSatellite(ctx context.Context, node nodes.Node) (_ multinodepb.EarnedPerSatelliteResponse, err error) { +// earnedSatellite returns earned split by satellites. +func (service *Service) earnedSatellite(ctx context.Context, node nodes.Node) (_ multinodepb.EarnedSatelliteResponse, err error) { conn, err := service.dialer.DialNodeURL(ctx, storj.NodeURL{ ID: node.ID, Address: node.PublicAddress, }) if err != nil { - return multinodepb.EarnedPerSatelliteResponse{}, Error.Wrap(err) + return multinodepb.EarnedSatelliteResponse{}, Error.Wrap(err) } defer func() { err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.EarnedPerSatellite(ctx, &multinodepb.EarnedPerSatelliteRequest{Header: header}) + response, err := payoutClient.EarnedSatellite(ctx, &multinodepb.EarnedSatelliteRequest{Header: header}) if err != nil { - return multinodepb.EarnedPerSatelliteResponse{}, Error.Wrap(err) + return multinodepb.EarnedSatelliteResponse{}, Error.Wrap(err) } return *response, nil } -// SatellitePaystubPeriod returns specific satellite paystub for specific period. -func (service *Service) SatellitePaystubPeriod(ctx context.Context, period string, nodeID, satelliteID storj.NodeID) (_ Paystub, err error) { +// PaystubSatellitePeriod returns specific satellite paystub for specific period. +func (service *Service) PaystubSatellitePeriod(ctx context.Context, period string, nodeID, satelliteID storj.NodeID) (_ Paystub, err error) { defer mon.Task()(&ctx)(&err) node, err := service.nodes.Get(ctx, nodeID) @@ -570,12 +572,12 @@ func (service *Service) SatellitePaystubPeriod(ctx context.Context, period strin err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.SatellitePeriodPaystub(ctx, &multinodepb.SatellitePeriodPaystubRequest{ + response, err := payoutClient.PaystubSatellitePeriod(ctx, &multinodepb.PaystubSatellitePeriodRequest{ Header: header, SatelliteId: satelliteID, Period: period, @@ -620,12 +622,12 @@ func (service *Service) PaystubPeriod(ctx context.Context, period string, nodeID err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.PeriodPaystub(ctx, &multinodepb.PeriodPaystubRequest{ + response, err := payoutClient.PaystubPeriod(ctx, &multinodepb.PaystubPeriodRequest{ Header: header, Period: period, }) @@ -648,8 +650,8 @@ func (service *Service) PaystubPeriod(ctx context.Context, period string, nodeID }, nil } -// SatellitePaystub returns specific satellite summed paystubs. -func (service *Service) SatellitePaystub(ctx context.Context, nodeID, satelliteID storj.NodeID) (_ Paystub, err error) { +// PaystubSatellite returns specific satellite summed paystubs. +func (service *Service) PaystubSatellite(ctx context.Context, nodeID, satelliteID storj.NodeID) (_ Paystub, err error) { defer mon.Task()(&ctx)(&err) node, err := service.nodes.Get(ctx, nodeID) @@ -669,12 +671,12 @@ func (service *Service) SatellitePaystub(ctx context.Context, nodeID, satelliteI err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } - response, err := payoutClient.SatellitePaystub(ctx, &multinodepb.SatellitePaystubRequest{ + response, err := payoutClient.PaystubSatellite(ctx, &multinodepb.PaystubSatelliteRequest{ Header: header, SatelliteId: satelliteID, }) @@ -718,7 +720,7 @@ func (service *Service) Paystub(ctx context.Context, nodeID storj.NodeID) (_ Pay err = errs.Combine(err, conn.Close()) }() - payoutClient := multinodepb.NewDRPCPayoutClient(conn) + payoutClient := multinodepb.NewDRPCPayoutsClient(conn) header := &multinodepb.RequestHeader{ ApiKey: node.APISecret, } diff --git a/private/multinodepb/multinode.pb.go b/private/multinodepb/multinode.pb.go index 562cb0b5b..2949202aa 100644 --- a/private/multinodepb/multinode.pb.go +++ b/private/multinodepb/multinode.pb.go @@ -766,159 +766,159 @@ func (m *EstimatedPayoutSatelliteResponse) GetEstimatedEarnings() int64 { return 0 } -type EstimatedPayoutTotalRequest struct { +type EstimatedPayoutRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *EstimatedPayoutTotalRequest) Reset() { *m = EstimatedPayoutTotalRequest{} } -func (m *EstimatedPayoutTotalRequest) String() string { return proto.CompactTextString(m) } -func (*EstimatedPayoutTotalRequest) ProtoMessage() {} -func (*EstimatedPayoutTotalRequest) Descriptor() ([]byte, []int) { +func (m *EstimatedPayoutRequest) Reset() { *m = EstimatedPayoutRequest{} } +func (m *EstimatedPayoutRequest) String() string { return proto.CompactTextString(m) } +func (*EstimatedPayoutRequest) ProtoMessage() {} +func (*EstimatedPayoutRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{15} } -func (m *EstimatedPayoutTotalRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EstimatedPayoutTotalRequest.Unmarshal(m, b) +func (m *EstimatedPayoutRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EstimatedPayoutRequest.Unmarshal(m, b) } -func (m *EstimatedPayoutTotalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EstimatedPayoutTotalRequest.Marshal(b, m, deterministic) +func (m *EstimatedPayoutRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EstimatedPayoutRequest.Marshal(b, m, deterministic) } -func (m *EstimatedPayoutTotalRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EstimatedPayoutTotalRequest.Merge(m, src) +func (m *EstimatedPayoutRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EstimatedPayoutRequest.Merge(m, src) } -func (m *EstimatedPayoutTotalRequest) XXX_Size() int { - return xxx_messageInfo_EstimatedPayoutTotalRequest.Size(m) +func (m *EstimatedPayoutRequest) XXX_Size() int { + return xxx_messageInfo_EstimatedPayoutRequest.Size(m) } -func (m *EstimatedPayoutTotalRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EstimatedPayoutTotalRequest.DiscardUnknown(m) +func (m *EstimatedPayoutRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EstimatedPayoutRequest.DiscardUnknown(m) } -var xxx_messageInfo_EstimatedPayoutTotalRequest proto.InternalMessageInfo +var xxx_messageInfo_EstimatedPayoutRequest proto.InternalMessageInfo -func (m *EstimatedPayoutTotalRequest) GetHeader() *RequestHeader { +func (m *EstimatedPayoutRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -type EstimatedPayoutTotalResponse struct { +type EstimatedPayoutResponse struct { EstimatedEarnings int64 `protobuf:"varint,1,opt,name=estimated_earnings,json=estimatedEarnings,proto3" json:"estimated_earnings,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *EstimatedPayoutTotalResponse) Reset() { *m = EstimatedPayoutTotalResponse{} } -func (m *EstimatedPayoutTotalResponse) String() string { return proto.CompactTextString(m) } -func (*EstimatedPayoutTotalResponse) ProtoMessage() {} -func (*EstimatedPayoutTotalResponse) Descriptor() ([]byte, []int) { +func (m *EstimatedPayoutResponse) Reset() { *m = EstimatedPayoutResponse{} } +func (m *EstimatedPayoutResponse) String() string { return proto.CompactTextString(m) } +func (*EstimatedPayoutResponse) ProtoMessage() {} +func (*EstimatedPayoutResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{16} } -func (m *EstimatedPayoutTotalResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EstimatedPayoutTotalResponse.Unmarshal(m, b) +func (m *EstimatedPayoutResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EstimatedPayoutResponse.Unmarshal(m, b) } -func (m *EstimatedPayoutTotalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EstimatedPayoutTotalResponse.Marshal(b, m, deterministic) +func (m *EstimatedPayoutResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EstimatedPayoutResponse.Marshal(b, m, deterministic) } -func (m *EstimatedPayoutTotalResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_EstimatedPayoutTotalResponse.Merge(m, src) +func (m *EstimatedPayoutResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_EstimatedPayoutResponse.Merge(m, src) } -func (m *EstimatedPayoutTotalResponse) XXX_Size() int { - return xxx_messageInfo_EstimatedPayoutTotalResponse.Size(m) +func (m *EstimatedPayoutResponse) XXX_Size() int { + return xxx_messageInfo_EstimatedPayoutResponse.Size(m) } -func (m *EstimatedPayoutTotalResponse) XXX_DiscardUnknown() { - xxx_messageInfo_EstimatedPayoutTotalResponse.DiscardUnknown(m) +func (m *EstimatedPayoutResponse) XXX_DiscardUnknown() { + xxx_messageInfo_EstimatedPayoutResponse.DiscardUnknown(m) } -var xxx_messageInfo_EstimatedPayoutTotalResponse proto.InternalMessageInfo +var xxx_messageInfo_EstimatedPayoutResponse proto.InternalMessageInfo -func (m *EstimatedPayoutTotalResponse) GetEstimatedEarnings() int64 { +func (m *EstimatedPayoutResponse) GetEstimatedEarnings() int64 { if m != nil { return m.EstimatedEarnings } return 0 } -type AllSatellitesSummaryRequest struct { +type SummaryRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *AllSatellitesSummaryRequest) Reset() { *m = AllSatellitesSummaryRequest{} } -func (m *AllSatellitesSummaryRequest) String() string { return proto.CompactTextString(m) } -func (*AllSatellitesSummaryRequest) ProtoMessage() {} -func (*AllSatellitesSummaryRequest) Descriptor() ([]byte, []int) { +func (m *SummaryRequest) Reset() { *m = SummaryRequest{} } +func (m *SummaryRequest) String() string { return proto.CompactTextString(m) } +func (*SummaryRequest) ProtoMessage() {} +func (*SummaryRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{17} } -func (m *AllSatellitesSummaryRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AllSatellitesSummaryRequest.Unmarshal(m, b) +func (m *SummaryRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummaryRequest.Unmarshal(m, b) } -func (m *AllSatellitesSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AllSatellitesSummaryRequest.Marshal(b, m, deterministic) +func (m *SummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummaryRequest.Marshal(b, m, deterministic) } -func (m *AllSatellitesSummaryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AllSatellitesSummaryRequest.Merge(m, src) +func (m *SummaryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummaryRequest.Merge(m, src) } -func (m *AllSatellitesSummaryRequest) XXX_Size() int { - return xxx_messageInfo_AllSatellitesSummaryRequest.Size(m) +func (m *SummaryRequest) XXX_Size() int { + return xxx_messageInfo_SummaryRequest.Size(m) } -func (m *AllSatellitesSummaryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AllSatellitesSummaryRequest.DiscardUnknown(m) +func (m *SummaryRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SummaryRequest.DiscardUnknown(m) } -var xxx_messageInfo_AllSatellitesSummaryRequest proto.InternalMessageInfo +var xxx_messageInfo_SummaryRequest proto.InternalMessageInfo -func (m *AllSatellitesSummaryRequest) GetHeader() *RequestHeader { +func (m *SummaryRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -type AllSatellitesSummaryResponse struct { +type SummaryResponse struct { PayoutInfo *PayoutInfo `protobuf:"bytes,1,opt,name=payout_info,json=payoutInfo,proto3" json:"payout_info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *AllSatellitesSummaryResponse) Reset() { *m = AllSatellitesSummaryResponse{} } -func (m *AllSatellitesSummaryResponse) String() string { return proto.CompactTextString(m) } -func (*AllSatellitesSummaryResponse) ProtoMessage() {} -func (*AllSatellitesSummaryResponse) Descriptor() ([]byte, []int) { +func (m *SummaryResponse) Reset() { *m = SummaryResponse{} } +func (m *SummaryResponse) String() string { return proto.CompactTextString(m) } +func (*SummaryResponse) ProtoMessage() {} +func (*SummaryResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{18} } -func (m *AllSatellitesSummaryResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AllSatellitesSummaryResponse.Unmarshal(m, b) +func (m *SummaryResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummaryResponse.Unmarshal(m, b) } -func (m *AllSatellitesSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AllSatellitesSummaryResponse.Marshal(b, m, deterministic) +func (m *SummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummaryResponse.Marshal(b, m, deterministic) } -func (m *AllSatellitesSummaryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_AllSatellitesSummaryResponse.Merge(m, src) +func (m *SummaryResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummaryResponse.Merge(m, src) } -func (m *AllSatellitesSummaryResponse) XXX_Size() int { - return xxx_messageInfo_AllSatellitesSummaryResponse.Size(m) +func (m *SummaryResponse) XXX_Size() int { + return xxx_messageInfo_SummaryResponse.Size(m) } -func (m *AllSatellitesSummaryResponse) XXX_DiscardUnknown() { - xxx_messageInfo_AllSatellitesSummaryResponse.DiscardUnknown(m) +func (m *SummaryResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SummaryResponse.DiscardUnknown(m) } -var xxx_messageInfo_AllSatellitesSummaryResponse proto.InternalMessageInfo +var xxx_messageInfo_SummaryResponse proto.InternalMessageInfo -func (m *AllSatellitesSummaryResponse) GetPayoutInfo() *PayoutInfo { +func (m *SummaryResponse) GetPayoutInfo() *PayoutInfo { if m != nil { return m.PayoutInfo } return nil } -type AllSatellitesPeriodSummaryRequest struct { +type SummaryPeriodRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` Period string `protobuf:"bytes,2,opt,name=period,proto3" json:"period,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -926,83 +926,83 @@ type AllSatellitesPeriodSummaryRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *AllSatellitesPeriodSummaryRequest) Reset() { *m = AllSatellitesPeriodSummaryRequest{} } -func (m *AllSatellitesPeriodSummaryRequest) String() string { return proto.CompactTextString(m) } -func (*AllSatellitesPeriodSummaryRequest) ProtoMessage() {} -func (*AllSatellitesPeriodSummaryRequest) Descriptor() ([]byte, []int) { +func (m *SummaryPeriodRequest) Reset() { *m = SummaryPeriodRequest{} } +func (m *SummaryPeriodRequest) String() string { return proto.CompactTextString(m) } +func (*SummaryPeriodRequest) ProtoMessage() {} +func (*SummaryPeriodRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{19} } -func (m *AllSatellitesPeriodSummaryRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AllSatellitesPeriodSummaryRequest.Unmarshal(m, b) +func (m *SummaryPeriodRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummaryPeriodRequest.Unmarshal(m, b) } -func (m *AllSatellitesPeriodSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AllSatellitesPeriodSummaryRequest.Marshal(b, m, deterministic) +func (m *SummaryPeriodRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummaryPeriodRequest.Marshal(b, m, deterministic) } -func (m *AllSatellitesPeriodSummaryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AllSatellitesPeriodSummaryRequest.Merge(m, src) +func (m *SummaryPeriodRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummaryPeriodRequest.Merge(m, src) } -func (m *AllSatellitesPeriodSummaryRequest) XXX_Size() int { - return xxx_messageInfo_AllSatellitesPeriodSummaryRequest.Size(m) +func (m *SummaryPeriodRequest) XXX_Size() int { + return xxx_messageInfo_SummaryPeriodRequest.Size(m) } -func (m *AllSatellitesPeriodSummaryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AllSatellitesPeriodSummaryRequest.DiscardUnknown(m) +func (m *SummaryPeriodRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SummaryPeriodRequest.DiscardUnknown(m) } -var xxx_messageInfo_AllSatellitesPeriodSummaryRequest proto.InternalMessageInfo +var xxx_messageInfo_SummaryPeriodRequest proto.InternalMessageInfo -func (m *AllSatellitesPeriodSummaryRequest) GetHeader() *RequestHeader { +func (m *SummaryPeriodRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -func (m *AllSatellitesPeriodSummaryRequest) GetPeriod() string { +func (m *SummaryPeriodRequest) GetPeriod() string { if m != nil { return m.Period } return "" } -type AllSatellitesPeriodSummaryResponse struct { +type SummaryPeriodResponse struct { PayoutInfo *PayoutInfo `protobuf:"bytes,1,opt,name=payout_info,json=payoutInfo,proto3" json:"payout_info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *AllSatellitesPeriodSummaryResponse) Reset() { *m = AllSatellitesPeriodSummaryResponse{} } -func (m *AllSatellitesPeriodSummaryResponse) String() string { return proto.CompactTextString(m) } -func (*AllSatellitesPeriodSummaryResponse) ProtoMessage() {} -func (*AllSatellitesPeriodSummaryResponse) Descriptor() ([]byte, []int) { +func (m *SummaryPeriodResponse) Reset() { *m = SummaryPeriodResponse{} } +func (m *SummaryPeriodResponse) String() string { return proto.CompactTextString(m) } +func (*SummaryPeriodResponse) ProtoMessage() {} +func (*SummaryPeriodResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{20} } -func (m *AllSatellitesPeriodSummaryResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AllSatellitesPeriodSummaryResponse.Unmarshal(m, b) +func (m *SummaryPeriodResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummaryPeriodResponse.Unmarshal(m, b) } -func (m *AllSatellitesPeriodSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AllSatellitesPeriodSummaryResponse.Marshal(b, m, deterministic) +func (m *SummaryPeriodResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummaryPeriodResponse.Marshal(b, m, deterministic) } -func (m *AllSatellitesPeriodSummaryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_AllSatellitesPeriodSummaryResponse.Merge(m, src) +func (m *SummaryPeriodResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummaryPeriodResponse.Merge(m, src) } -func (m *AllSatellitesPeriodSummaryResponse) XXX_Size() int { - return xxx_messageInfo_AllSatellitesPeriodSummaryResponse.Size(m) +func (m *SummaryPeriodResponse) XXX_Size() int { + return xxx_messageInfo_SummaryPeriodResponse.Size(m) } -func (m *AllSatellitesPeriodSummaryResponse) XXX_DiscardUnknown() { - xxx_messageInfo_AllSatellitesPeriodSummaryResponse.DiscardUnknown(m) +func (m *SummaryPeriodResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SummaryPeriodResponse.DiscardUnknown(m) } -var xxx_messageInfo_AllSatellitesPeriodSummaryResponse proto.InternalMessageInfo +var xxx_messageInfo_SummaryPeriodResponse proto.InternalMessageInfo -func (m *AllSatellitesPeriodSummaryResponse) GetPayoutInfo() *PayoutInfo { +func (m *SummaryPeriodResponse) GetPayoutInfo() *PayoutInfo { if m != nil { return m.PayoutInfo } return nil } -type SatelliteSummaryRequest struct { +type SummarySatelliteRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` SatelliteId NodeID `protobuf:"bytes,2,opt,name=satellite_id,json=satelliteId,proto3,customtype=NodeID" json:"satellite_id"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1010,76 +1010,76 @@ type SatelliteSummaryRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *SatelliteSummaryRequest) Reset() { *m = SatelliteSummaryRequest{} } -func (m *SatelliteSummaryRequest) String() string { return proto.CompactTextString(m) } -func (*SatelliteSummaryRequest) ProtoMessage() {} -func (*SatelliteSummaryRequest) Descriptor() ([]byte, []int) { +func (m *SummarySatelliteRequest) Reset() { *m = SummarySatelliteRequest{} } +func (m *SummarySatelliteRequest) String() string { return proto.CompactTextString(m) } +func (*SummarySatelliteRequest) ProtoMessage() {} +func (*SummarySatelliteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{21} } -func (m *SatelliteSummaryRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatelliteSummaryRequest.Unmarshal(m, b) +func (m *SummarySatelliteRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummarySatelliteRequest.Unmarshal(m, b) } -func (m *SatelliteSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatelliteSummaryRequest.Marshal(b, m, deterministic) +func (m *SummarySatelliteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummarySatelliteRequest.Marshal(b, m, deterministic) } -func (m *SatelliteSummaryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatelliteSummaryRequest.Merge(m, src) +func (m *SummarySatelliteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummarySatelliteRequest.Merge(m, src) } -func (m *SatelliteSummaryRequest) XXX_Size() int { - return xxx_messageInfo_SatelliteSummaryRequest.Size(m) +func (m *SummarySatelliteRequest) XXX_Size() int { + return xxx_messageInfo_SummarySatelliteRequest.Size(m) } -func (m *SatelliteSummaryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SatelliteSummaryRequest.DiscardUnknown(m) +func (m *SummarySatelliteRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SummarySatelliteRequest.DiscardUnknown(m) } -var xxx_messageInfo_SatelliteSummaryRequest proto.InternalMessageInfo +var xxx_messageInfo_SummarySatelliteRequest proto.InternalMessageInfo -func (m *SatelliteSummaryRequest) GetHeader() *RequestHeader { +func (m *SummarySatelliteRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -type SatelliteSummaryResponse struct { +type SummarySatelliteResponse struct { PayoutInfo *PayoutInfo `protobuf:"bytes,1,opt,name=payout_info,json=payoutInfo,proto3" json:"payout_info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SatelliteSummaryResponse) Reset() { *m = SatelliteSummaryResponse{} } -func (m *SatelliteSummaryResponse) String() string { return proto.CompactTextString(m) } -func (*SatelliteSummaryResponse) ProtoMessage() {} -func (*SatelliteSummaryResponse) Descriptor() ([]byte, []int) { +func (m *SummarySatelliteResponse) Reset() { *m = SummarySatelliteResponse{} } +func (m *SummarySatelliteResponse) String() string { return proto.CompactTextString(m) } +func (*SummarySatelliteResponse) ProtoMessage() {} +func (*SummarySatelliteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{22} } -func (m *SatelliteSummaryResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatelliteSummaryResponse.Unmarshal(m, b) +func (m *SummarySatelliteResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummarySatelliteResponse.Unmarshal(m, b) } -func (m *SatelliteSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatelliteSummaryResponse.Marshal(b, m, deterministic) +func (m *SummarySatelliteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummarySatelliteResponse.Marshal(b, m, deterministic) } -func (m *SatelliteSummaryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatelliteSummaryResponse.Merge(m, src) +func (m *SummarySatelliteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummarySatelliteResponse.Merge(m, src) } -func (m *SatelliteSummaryResponse) XXX_Size() int { - return xxx_messageInfo_SatelliteSummaryResponse.Size(m) +func (m *SummarySatelliteResponse) XXX_Size() int { + return xxx_messageInfo_SummarySatelliteResponse.Size(m) } -func (m *SatelliteSummaryResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SatelliteSummaryResponse.DiscardUnknown(m) +func (m *SummarySatelliteResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SummarySatelliteResponse.DiscardUnknown(m) } -var xxx_messageInfo_SatelliteSummaryResponse proto.InternalMessageInfo +var xxx_messageInfo_SummarySatelliteResponse proto.InternalMessageInfo -func (m *SatelliteSummaryResponse) GetPayoutInfo() *PayoutInfo { +func (m *SummarySatelliteResponse) GetPayoutInfo() *PayoutInfo { if m != nil { return m.PayoutInfo } return nil } -type SatellitePeriodSummaryRequest struct { +type SummarySatellitePeriodRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` SatelliteId NodeID `protobuf:"bytes,2,opt,name=satellite_id,json=satelliteId,proto3,customtype=NodeID" json:"satellite_id"` Period string `protobuf:"bytes,3,opt,name=period,proto3" json:"period,omitempty"` @@ -1088,76 +1088,76 @@ type SatellitePeriodSummaryRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *SatellitePeriodSummaryRequest) Reset() { *m = SatellitePeriodSummaryRequest{} } -func (m *SatellitePeriodSummaryRequest) String() string { return proto.CompactTextString(m) } -func (*SatellitePeriodSummaryRequest) ProtoMessage() {} -func (*SatellitePeriodSummaryRequest) Descriptor() ([]byte, []int) { +func (m *SummarySatellitePeriodRequest) Reset() { *m = SummarySatellitePeriodRequest{} } +func (m *SummarySatellitePeriodRequest) String() string { return proto.CompactTextString(m) } +func (*SummarySatellitePeriodRequest) ProtoMessage() {} +func (*SummarySatellitePeriodRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{23} } -func (m *SatellitePeriodSummaryRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatellitePeriodSummaryRequest.Unmarshal(m, b) +func (m *SummarySatellitePeriodRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummarySatellitePeriodRequest.Unmarshal(m, b) } -func (m *SatellitePeriodSummaryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatellitePeriodSummaryRequest.Marshal(b, m, deterministic) +func (m *SummarySatellitePeriodRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummarySatellitePeriodRequest.Marshal(b, m, deterministic) } -func (m *SatellitePeriodSummaryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatellitePeriodSummaryRequest.Merge(m, src) +func (m *SummarySatellitePeriodRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummarySatellitePeriodRequest.Merge(m, src) } -func (m *SatellitePeriodSummaryRequest) XXX_Size() int { - return xxx_messageInfo_SatellitePeriodSummaryRequest.Size(m) +func (m *SummarySatellitePeriodRequest) XXX_Size() int { + return xxx_messageInfo_SummarySatellitePeriodRequest.Size(m) } -func (m *SatellitePeriodSummaryRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SatellitePeriodSummaryRequest.DiscardUnknown(m) +func (m *SummarySatellitePeriodRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SummarySatellitePeriodRequest.DiscardUnknown(m) } -var xxx_messageInfo_SatellitePeriodSummaryRequest proto.InternalMessageInfo +var xxx_messageInfo_SummarySatellitePeriodRequest proto.InternalMessageInfo -func (m *SatellitePeriodSummaryRequest) GetHeader() *RequestHeader { +func (m *SummarySatellitePeriodRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -func (m *SatellitePeriodSummaryRequest) GetPeriod() string { +func (m *SummarySatellitePeriodRequest) GetPeriod() string { if m != nil { return m.Period } return "" } -type SatellitePeriodSummaryResponse struct { +type SummarySatellitePeriodResponse struct { PayoutInfo *PayoutInfo `protobuf:"bytes,1,opt,name=payout_info,json=payoutInfo,proto3" json:"payout_info,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SatellitePeriodSummaryResponse) Reset() { *m = SatellitePeriodSummaryResponse{} } -func (m *SatellitePeriodSummaryResponse) String() string { return proto.CompactTextString(m) } -func (*SatellitePeriodSummaryResponse) ProtoMessage() {} -func (*SatellitePeriodSummaryResponse) Descriptor() ([]byte, []int) { +func (m *SummarySatellitePeriodResponse) Reset() { *m = SummarySatellitePeriodResponse{} } +func (m *SummarySatellitePeriodResponse) String() string { return proto.CompactTextString(m) } +func (*SummarySatellitePeriodResponse) ProtoMessage() {} +func (*SummarySatellitePeriodResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{24} } -func (m *SatellitePeriodSummaryResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatellitePeriodSummaryResponse.Unmarshal(m, b) +func (m *SummarySatellitePeriodResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SummarySatellitePeriodResponse.Unmarshal(m, b) } -func (m *SatellitePeriodSummaryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatellitePeriodSummaryResponse.Marshal(b, m, deterministic) +func (m *SummarySatellitePeriodResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SummarySatellitePeriodResponse.Marshal(b, m, deterministic) } -func (m *SatellitePeriodSummaryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatellitePeriodSummaryResponse.Merge(m, src) +func (m *SummarySatellitePeriodResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SummarySatellitePeriodResponse.Merge(m, src) } -func (m *SatellitePeriodSummaryResponse) XXX_Size() int { - return xxx_messageInfo_SatellitePeriodSummaryResponse.Size(m) +func (m *SummarySatellitePeriodResponse) XXX_Size() int { + return xxx_messageInfo_SummarySatellitePeriodResponse.Size(m) } -func (m *SatellitePeriodSummaryResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SatellitePeriodSummaryResponse.DiscardUnknown(m) +func (m *SummarySatellitePeriodResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SummarySatellitePeriodResponse.DiscardUnknown(m) } -var xxx_messageInfo_SatellitePeriodSummaryResponse proto.InternalMessageInfo +var xxx_messageInfo_SummarySatellitePeriodResponse proto.InternalMessageInfo -func (m *SatellitePeriodSummaryResponse) GetPayoutInfo() *PayoutInfo { +func (m *SummarySatellitePeriodResponse) GetPayoutInfo() *PayoutInfo { if m != nil { return m.PayoutInfo } @@ -1240,76 +1240,76 @@ func (m *EarnedResponse) GetTotal() int64 { return 0 } -type EarnedPerSatelliteRequest struct { +type EarnedSatelliteRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *EarnedPerSatelliteRequest) Reset() { *m = EarnedPerSatelliteRequest{} } -func (m *EarnedPerSatelliteRequest) String() string { return proto.CompactTextString(m) } -func (*EarnedPerSatelliteRequest) ProtoMessage() {} -func (*EarnedPerSatelliteRequest) Descriptor() ([]byte, []int) { +func (m *EarnedSatelliteRequest) Reset() { *m = EarnedSatelliteRequest{} } +func (m *EarnedSatelliteRequest) String() string { return proto.CompactTextString(m) } +func (*EarnedSatelliteRequest) ProtoMessage() {} +func (*EarnedSatelliteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{27} } -func (m *EarnedPerSatelliteRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EarnedPerSatelliteRequest.Unmarshal(m, b) +func (m *EarnedSatelliteRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EarnedSatelliteRequest.Unmarshal(m, b) } -func (m *EarnedPerSatelliteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EarnedPerSatelliteRequest.Marshal(b, m, deterministic) +func (m *EarnedSatelliteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EarnedSatelliteRequest.Marshal(b, m, deterministic) } -func (m *EarnedPerSatelliteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EarnedPerSatelliteRequest.Merge(m, src) +func (m *EarnedSatelliteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EarnedSatelliteRequest.Merge(m, src) } -func (m *EarnedPerSatelliteRequest) XXX_Size() int { - return xxx_messageInfo_EarnedPerSatelliteRequest.Size(m) +func (m *EarnedSatelliteRequest) XXX_Size() int { + return xxx_messageInfo_EarnedSatelliteRequest.Size(m) } -func (m *EarnedPerSatelliteRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EarnedPerSatelliteRequest.DiscardUnknown(m) +func (m *EarnedSatelliteRequest) XXX_DiscardUnknown() { + xxx_messageInfo_EarnedSatelliteRequest.DiscardUnknown(m) } -var xxx_messageInfo_EarnedPerSatelliteRequest proto.InternalMessageInfo +var xxx_messageInfo_EarnedSatelliteRequest proto.InternalMessageInfo -func (m *EarnedPerSatelliteRequest) GetHeader() *RequestHeader { +func (m *EarnedSatelliteRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -type EarnedPerSatelliteResponse struct { +type EarnedSatelliteResponse struct { EarnedSatellite []*EarnedSatellite `protobuf:"bytes,1,rep,name=earned_satellite,json=earnedSatellite,proto3" json:"earned_satellite,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *EarnedPerSatelliteResponse) Reset() { *m = EarnedPerSatelliteResponse{} } -func (m *EarnedPerSatelliteResponse) String() string { return proto.CompactTextString(m) } -func (*EarnedPerSatelliteResponse) ProtoMessage() {} -func (*EarnedPerSatelliteResponse) Descriptor() ([]byte, []int) { +func (m *EarnedSatelliteResponse) Reset() { *m = EarnedSatelliteResponse{} } +func (m *EarnedSatelliteResponse) String() string { return proto.CompactTextString(m) } +func (*EarnedSatelliteResponse) ProtoMessage() {} +func (*EarnedSatelliteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{28} } -func (m *EarnedPerSatelliteResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EarnedPerSatelliteResponse.Unmarshal(m, b) +func (m *EarnedSatelliteResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_EarnedSatelliteResponse.Unmarshal(m, b) } -func (m *EarnedPerSatelliteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EarnedPerSatelliteResponse.Marshal(b, m, deterministic) +func (m *EarnedSatelliteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_EarnedSatelliteResponse.Marshal(b, m, deterministic) } -func (m *EarnedPerSatelliteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_EarnedPerSatelliteResponse.Merge(m, src) +func (m *EarnedSatelliteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_EarnedSatelliteResponse.Merge(m, src) } -func (m *EarnedPerSatelliteResponse) XXX_Size() int { - return xxx_messageInfo_EarnedPerSatelliteResponse.Size(m) +func (m *EarnedSatelliteResponse) XXX_Size() int { + return xxx_messageInfo_EarnedSatelliteResponse.Size(m) } -func (m *EarnedPerSatelliteResponse) XXX_DiscardUnknown() { - xxx_messageInfo_EarnedPerSatelliteResponse.DiscardUnknown(m) +func (m *EarnedSatelliteResponse) XXX_DiscardUnknown() { + xxx_messageInfo_EarnedSatelliteResponse.DiscardUnknown(m) } -var xxx_messageInfo_EarnedPerSatelliteResponse proto.InternalMessageInfo +var xxx_messageInfo_EarnedSatelliteResponse proto.InternalMessageInfo -func (m *EarnedPerSatelliteResponse) GetEarnedSatellite() []*EarnedSatellite { +func (m *EarnedSatelliteResponse) GetEarnedSatellite() []*EarnedSatellite { if m != nil { return m.EarnedSatellite } @@ -1431,7 +1431,7 @@ func (m *UndistributedResponse) GetTotal() int64 { return 0 } -type SatellitePaystubRequest struct { +type PaystubSatelliteRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` SatelliteId NodeID `protobuf:"bytes,2,opt,name=satellite_id,json=satelliteId,proto3,customtype=NodeID" json:"satellite_id"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1439,69 +1439,69 @@ type SatellitePaystubRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *SatellitePaystubRequest) Reset() { *m = SatellitePaystubRequest{} } -func (m *SatellitePaystubRequest) String() string { return proto.CompactTextString(m) } -func (*SatellitePaystubRequest) ProtoMessage() {} -func (*SatellitePaystubRequest) Descriptor() ([]byte, []int) { +func (m *PaystubSatelliteRequest) Reset() { *m = PaystubSatelliteRequest{} } +func (m *PaystubSatelliteRequest) String() string { return proto.CompactTextString(m) } +func (*PaystubSatelliteRequest) ProtoMessage() {} +func (*PaystubSatelliteRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{32} } -func (m *SatellitePaystubRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatellitePaystubRequest.Unmarshal(m, b) +func (m *PaystubSatelliteRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PaystubSatelliteRequest.Unmarshal(m, b) } -func (m *SatellitePaystubRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatellitePaystubRequest.Marshal(b, m, deterministic) +func (m *PaystubSatelliteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PaystubSatelliteRequest.Marshal(b, m, deterministic) } -func (m *SatellitePaystubRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatellitePaystubRequest.Merge(m, src) +func (m *PaystubSatelliteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PaystubSatelliteRequest.Merge(m, src) } -func (m *SatellitePaystubRequest) XXX_Size() int { - return xxx_messageInfo_SatellitePaystubRequest.Size(m) +func (m *PaystubSatelliteRequest) XXX_Size() int { + return xxx_messageInfo_PaystubSatelliteRequest.Size(m) } -func (m *SatellitePaystubRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SatellitePaystubRequest.DiscardUnknown(m) +func (m *PaystubSatelliteRequest) XXX_DiscardUnknown() { + xxx_messageInfo_PaystubSatelliteRequest.DiscardUnknown(m) } -var xxx_messageInfo_SatellitePaystubRequest proto.InternalMessageInfo +var xxx_messageInfo_PaystubSatelliteRequest proto.InternalMessageInfo -func (m *SatellitePaystubRequest) GetHeader() *RequestHeader { +func (m *PaystubSatelliteRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -type SatellitePaystubResponse struct { +type PaystubSatelliteResponse struct { Paystub *Paystub `protobuf:"bytes,1,opt,name=paystub,proto3" json:"paystub,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SatellitePaystubResponse) Reset() { *m = SatellitePaystubResponse{} } -func (m *SatellitePaystubResponse) String() string { return proto.CompactTextString(m) } -func (*SatellitePaystubResponse) ProtoMessage() {} -func (*SatellitePaystubResponse) Descriptor() ([]byte, []int) { +func (m *PaystubSatelliteResponse) Reset() { *m = PaystubSatelliteResponse{} } +func (m *PaystubSatelliteResponse) String() string { return proto.CompactTextString(m) } +func (*PaystubSatelliteResponse) ProtoMessage() {} +func (*PaystubSatelliteResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{33} } -func (m *SatellitePaystubResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatellitePaystubResponse.Unmarshal(m, b) +func (m *PaystubSatelliteResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PaystubSatelliteResponse.Unmarshal(m, b) } -func (m *SatellitePaystubResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatellitePaystubResponse.Marshal(b, m, deterministic) +func (m *PaystubSatelliteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PaystubSatelliteResponse.Marshal(b, m, deterministic) } -func (m *SatellitePaystubResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatellitePaystubResponse.Merge(m, src) +func (m *PaystubSatelliteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PaystubSatelliteResponse.Merge(m, src) } -func (m *SatellitePaystubResponse) XXX_Size() int { - return xxx_messageInfo_SatellitePaystubResponse.Size(m) +func (m *PaystubSatelliteResponse) XXX_Size() int { + return xxx_messageInfo_PaystubSatelliteResponse.Size(m) } -func (m *SatellitePaystubResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SatellitePaystubResponse.DiscardUnknown(m) +func (m *PaystubSatelliteResponse) XXX_DiscardUnknown() { + xxx_messageInfo_PaystubSatelliteResponse.DiscardUnknown(m) } -var xxx_messageInfo_SatellitePaystubResponse proto.InternalMessageInfo +var xxx_messageInfo_PaystubSatelliteResponse proto.InternalMessageInfo -func (m *SatellitePaystubResponse) GetPaystub() *Paystub { +func (m *PaystubSatelliteResponse) GetPaystub() *Paystub { if m != nil { return m.Paystub } @@ -1584,7 +1584,7 @@ func (m *PaystubResponse) GetPaystub() *Paystub { return nil } -type PeriodPaystubRequest struct { +type PaystubPeriodRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` Period string `protobuf:"bytes,2,opt,name=period,proto3" json:"period,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1592,83 +1592,83 @@ type PeriodPaystubRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *PeriodPaystubRequest) Reset() { *m = PeriodPaystubRequest{} } -func (m *PeriodPaystubRequest) String() string { return proto.CompactTextString(m) } -func (*PeriodPaystubRequest) ProtoMessage() {} -func (*PeriodPaystubRequest) Descriptor() ([]byte, []int) { +func (m *PaystubPeriodRequest) Reset() { *m = PaystubPeriodRequest{} } +func (m *PaystubPeriodRequest) String() string { return proto.CompactTextString(m) } +func (*PaystubPeriodRequest) ProtoMessage() {} +func (*PaystubPeriodRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{36} } -func (m *PeriodPaystubRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PeriodPaystubRequest.Unmarshal(m, b) +func (m *PaystubPeriodRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PaystubPeriodRequest.Unmarshal(m, b) } -func (m *PeriodPaystubRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PeriodPaystubRequest.Marshal(b, m, deterministic) +func (m *PaystubPeriodRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PaystubPeriodRequest.Marshal(b, m, deterministic) } -func (m *PeriodPaystubRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PeriodPaystubRequest.Merge(m, src) +func (m *PaystubPeriodRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PaystubPeriodRequest.Merge(m, src) } -func (m *PeriodPaystubRequest) XXX_Size() int { - return xxx_messageInfo_PeriodPaystubRequest.Size(m) +func (m *PaystubPeriodRequest) XXX_Size() int { + return xxx_messageInfo_PaystubPeriodRequest.Size(m) } -func (m *PeriodPaystubRequest) XXX_DiscardUnknown() { - xxx_messageInfo_PeriodPaystubRequest.DiscardUnknown(m) +func (m *PaystubPeriodRequest) XXX_DiscardUnknown() { + xxx_messageInfo_PaystubPeriodRequest.DiscardUnknown(m) } -var xxx_messageInfo_PeriodPaystubRequest proto.InternalMessageInfo +var xxx_messageInfo_PaystubPeriodRequest proto.InternalMessageInfo -func (m *PeriodPaystubRequest) GetHeader() *RequestHeader { +func (m *PaystubPeriodRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -func (m *PeriodPaystubRequest) GetPeriod() string { +func (m *PaystubPeriodRequest) GetPeriod() string { if m != nil { return m.Period } return "" } -type PeriodPaystubResponse struct { +type PaystubPeriodResponse struct { Paystub *Paystub `protobuf:"bytes,1,opt,name=paystub,proto3" json:"paystub,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *PeriodPaystubResponse) Reset() { *m = PeriodPaystubResponse{} } -func (m *PeriodPaystubResponse) String() string { return proto.CompactTextString(m) } -func (*PeriodPaystubResponse) ProtoMessage() {} -func (*PeriodPaystubResponse) Descriptor() ([]byte, []int) { +func (m *PaystubPeriodResponse) Reset() { *m = PaystubPeriodResponse{} } +func (m *PaystubPeriodResponse) String() string { return proto.CompactTextString(m) } +func (*PaystubPeriodResponse) ProtoMessage() {} +func (*PaystubPeriodResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{37} } -func (m *PeriodPaystubResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PeriodPaystubResponse.Unmarshal(m, b) +func (m *PaystubPeriodResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PaystubPeriodResponse.Unmarshal(m, b) } -func (m *PeriodPaystubResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PeriodPaystubResponse.Marshal(b, m, deterministic) +func (m *PaystubPeriodResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PaystubPeriodResponse.Marshal(b, m, deterministic) } -func (m *PeriodPaystubResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PeriodPaystubResponse.Merge(m, src) +func (m *PaystubPeriodResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PaystubPeriodResponse.Merge(m, src) } -func (m *PeriodPaystubResponse) XXX_Size() int { - return xxx_messageInfo_PeriodPaystubResponse.Size(m) +func (m *PaystubPeriodResponse) XXX_Size() int { + return xxx_messageInfo_PaystubPeriodResponse.Size(m) } -func (m *PeriodPaystubResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PeriodPaystubResponse.DiscardUnknown(m) +func (m *PaystubPeriodResponse) XXX_DiscardUnknown() { + xxx_messageInfo_PaystubPeriodResponse.DiscardUnknown(m) } -var xxx_messageInfo_PeriodPaystubResponse proto.InternalMessageInfo +var xxx_messageInfo_PaystubPeriodResponse proto.InternalMessageInfo -func (m *PeriodPaystubResponse) GetPaystub() *Paystub { +func (m *PaystubPeriodResponse) GetPaystub() *Paystub { if m != nil { return m.Paystub } return nil } -type SatellitePeriodPaystubRequest struct { +type PaystubSatellitePeriodRequest struct { Header *RequestHeader `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` SatelliteId NodeID `protobuf:"bytes,2,opt,name=satellite_id,json=satelliteId,proto3,customtype=NodeID" json:"satellite_id"` Period string `protobuf:"bytes,3,opt,name=period,proto3" json:"period,omitempty"` @@ -1677,76 +1677,76 @@ type SatellitePeriodPaystubRequest struct { XXX_sizecache int32 `json:"-"` } -func (m *SatellitePeriodPaystubRequest) Reset() { *m = SatellitePeriodPaystubRequest{} } -func (m *SatellitePeriodPaystubRequest) String() string { return proto.CompactTextString(m) } -func (*SatellitePeriodPaystubRequest) ProtoMessage() {} -func (*SatellitePeriodPaystubRequest) Descriptor() ([]byte, []int) { +func (m *PaystubSatellitePeriodRequest) Reset() { *m = PaystubSatellitePeriodRequest{} } +func (m *PaystubSatellitePeriodRequest) String() string { return proto.CompactTextString(m) } +func (*PaystubSatellitePeriodRequest) ProtoMessage() {} +func (*PaystubSatellitePeriodRequest) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{38} } -func (m *SatellitePeriodPaystubRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatellitePeriodPaystubRequest.Unmarshal(m, b) +func (m *PaystubSatellitePeriodRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PaystubSatellitePeriodRequest.Unmarshal(m, b) } -func (m *SatellitePeriodPaystubRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatellitePeriodPaystubRequest.Marshal(b, m, deterministic) +func (m *PaystubSatellitePeriodRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PaystubSatellitePeriodRequest.Marshal(b, m, deterministic) } -func (m *SatellitePeriodPaystubRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatellitePeriodPaystubRequest.Merge(m, src) +func (m *PaystubSatellitePeriodRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PaystubSatellitePeriodRequest.Merge(m, src) } -func (m *SatellitePeriodPaystubRequest) XXX_Size() int { - return xxx_messageInfo_SatellitePeriodPaystubRequest.Size(m) +func (m *PaystubSatellitePeriodRequest) XXX_Size() int { + return xxx_messageInfo_PaystubSatellitePeriodRequest.Size(m) } -func (m *SatellitePeriodPaystubRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SatellitePeriodPaystubRequest.DiscardUnknown(m) +func (m *PaystubSatellitePeriodRequest) XXX_DiscardUnknown() { + xxx_messageInfo_PaystubSatellitePeriodRequest.DiscardUnknown(m) } -var xxx_messageInfo_SatellitePeriodPaystubRequest proto.InternalMessageInfo +var xxx_messageInfo_PaystubSatellitePeriodRequest proto.InternalMessageInfo -func (m *SatellitePeriodPaystubRequest) GetHeader() *RequestHeader { +func (m *PaystubSatellitePeriodRequest) GetHeader() *RequestHeader { if m != nil { return m.Header } return nil } -func (m *SatellitePeriodPaystubRequest) GetPeriod() string { +func (m *PaystubSatellitePeriodRequest) GetPeriod() string { if m != nil { return m.Period } return "" } -type SatellitePeriodPaystubResponse struct { +type PaystubSatellitePeriodResponse struct { Paystub *Paystub `protobuf:"bytes,1,opt,name=paystub,proto3" json:"paystub,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SatellitePeriodPaystubResponse) Reset() { *m = SatellitePeriodPaystubResponse{} } -func (m *SatellitePeriodPaystubResponse) String() string { return proto.CompactTextString(m) } -func (*SatellitePeriodPaystubResponse) ProtoMessage() {} -func (*SatellitePeriodPaystubResponse) Descriptor() ([]byte, []int) { +func (m *PaystubSatellitePeriodResponse) Reset() { *m = PaystubSatellitePeriodResponse{} } +func (m *PaystubSatellitePeriodResponse) String() string { return proto.CompactTextString(m) } +func (*PaystubSatellitePeriodResponse) ProtoMessage() {} +func (*PaystubSatellitePeriodResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a45fd79b06f3a1b, []int{39} } -func (m *SatellitePeriodPaystubResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SatellitePeriodPaystubResponse.Unmarshal(m, b) +func (m *PaystubSatellitePeriodResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PaystubSatellitePeriodResponse.Unmarshal(m, b) } -func (m *SatellitePeriodPaystubResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SatellitePeriodPaystubResponse.Marshal(b, m, deterministic) +func (m *PaystubSatellitePeriodResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PaystubSatellitePeriodResponse.Marshal(b, m, deterministic) } -func (m *SatellitePeriodPaystubResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SatellitePeriodPaystubResponse.Merge(m, src) +func (m *PaystubSatellitePeriodResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PaystubSatellitePeriodResponse.Merge(m, src) } -func (m *SatellitePeriodPaystubResponse) XXX_Size() int { - return xxx_messageInfo_SatellitePeriodPaystubResponse.Size(m) +func (m *PaystubSatellitePeriodResponse) XXX_Size() int { + return xxx_messageInfo_PaystubSatellitePeriodResponse.Size(m) } -func (m *SatellitePeriodPaystubResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SatellitePeriodPaystubResponse.DiscardUnknown(m) +func (m *PaystubSatellitePeriodResponse) XXX_DiscardUnknown() { + xxx_messageInfo_PaystubSatellitePeriodResponse.DiscardUnknown(m) } -var xxx_messageInfo_SatellitePeriodPaystubResponse proto.InternalMessageInfo +var xxx_messageInfo_PaystubSatellitePeriodResponse proto.InternalMessageInfo -func (m *SatellitePeriodPaystubResponse) GetPaystub() *Paystub { +func (m *PaystubSatellitePeriodResponse) GetPaystub() *Paystub { if m != nil { return m.Paystub } @@ -2101,31 +2101,31 @@ func init() { proto.RegisterType((*TrustedSatellitesResponse_NodeURL)(nil), "multinode.TrustedSatellitesResponse.NodeURL") proto.RegisterType((*EstimatedPayoutSatelliteRequest)(nil), "multinode.EstimatedPayoutSatelliteRequest") proto.RegisterType((*EstimatedPayoutSatelliteResponse)(nil), "multinode.EstimatedPayoutSatelliteResponse") - proto.RegisterType((*EstimatedPayoutTotalRequest)(nil), "multinode.EstimatedPayoutTotalRequest") - proto.RegisterType((*EstimatedPayoutTotalResponse)(nil), "multinode.EstimatedPayoutTotalResponse") - proto.RegisterType((*AllSatellitesSummaryRequest)(nil), "multinode.AllSatellitesSummaryRequest") - proto.RegisterType((*AllSatellitesSummaryResponse)(nil), "multinode.AllSatellitesSummaryResponse") - proto.RegisterType((*AllSatellitesPeriodSummaryRequest)(nil), "multinode.AllSatellitesPeriodSummaryRequest") - proto.RegisterType((*AllSatellitesPeriodSummaryResponse)(nil), "multinode.AllSatellitesPeriodSummaryResponse") - proto.RegisterType((*SatelliteSummaryRequest)(nil), "multinode.SatelliteSummaryRequest") - proto.RegisterType((*SatelliteSummaryResponse)(nil), "multinode.SatelliteSummaryResponse") - proto.RegisterType((*SatellitePeriodSummaryRequest)(nil), "multinode.SatellitePeriodSummaryRequest") - proto.RegisterType((*SatellitePeriodSummaryResponse)(nil), "multinode.SatellitePeriodSummaryResponse") + proto.RegisterType((*EstimatedPayoutRequest)(nil), "multinode.EstimatedPayoutRequest") + proto.RegisterType((*EstimatedPayoutResponse)(nil), "multinode.EstimatedPayoutResponse") + proto.RegisterType((*SummaryRequest)(nil), "multinode.SummaryRequest") + proto.RegisterType((*SummaryResponse)(nil), "multinode.SummaryResponse") + proto.RegisterType((*SummaryPeriodRequest)(nil), "multinode.SummaryPeriodRequest") + proto.RegisterType((*SummaryPeriodResponse)(nil), "multinode.SummaryPeriodResponse") + proto.RegisterType((*SummarySatelliteRequest)(nil), "multinode.SummarySatelliteRequest") + proto.RegisterType((*SummarySatelliteResponse)(nil), "multinode.SummarySatelliteResponse") + proto.RegisterType((*SummarySatellitePeriodRequest)(nil), "multinode.SummarySatellitePeriodRequest") + proto.RegisterType((*SummarySatellitePeriodResponse)(nil), "multinode.SummarySatellitePeriodResponse") proto.RegisterType((*EarnedRequest)(nil), "multinode.EarnedRequest") proto.RegisterType((*EarnedResponse)(nil), "multinode.EarnedResponse") - proto.RegisterType((*EarnedPerSatelliteRequest)(nil), "multinode.EarnedPerSatelliteRequest") - proto.RegisterType((*EarnedPerSatelliteResponse)(nil), "multinode.EarnedPerSatelliteResponse") + proto.RegisterType((*EarnedSatelliteRequest)(nil), "multinode.EarnedSatelliteRequest") + proto.RegisterType((*EarnedSatelliteResponse)(nil), "multinode.EarnedSatelliteResponse") proto.RegisterType((*EarnedSatellite)(nil), "multinode.EarnedSatellite") proto.RegisterType((*UndistributedRequest)(nil), "multinode.UndistributedRequest") proto.RegisterType((*UndistributedResponse)(nil), "multinode.UndistributedResponse") - proto.RegisterType((*SatellitePaystubRequest)(nil), "multinode.SatellitePaystubRequest") - proto.RegisterType((*SatellitePaystubResponse)(nil), "multinode.SatellitePaystubResponse") + proto.RegisterType((*PaystubSatelliteRequest)(nil), "multinode.PaystubSatelliteRequest") + proto.RegisterType((*PaystubSatelliteResponse)(nil), "multinode.PaystubSatelliteResponse") proto.RegisterType((*PaystubRequest)(nil), "multinode.PaystubRequest") proto.RegisterType((*PaystubResponse)(nil), "multinode.PaystubResponse") - proto.RegisterType((*PeriodPaystubRequest)(nil), "multinode.PeriodPaystubRequest") - proto.RegisterType((*PeriodPaystubResponse)(nil), "multinode.PeriodPaystubResponse") - proto.RegisterType((*SatellitePeriodPaystubRequest)(nil), "multinode.SatellitePeriodPaystubRequest") - proto.RegisterType((*SatellitePeriodPaystubResponse)(nil), "multinode.SatellitePeriodPaystubResponse") + proto.RegisterType((*PaystubPeriodRequest)(nil), "multinode.PaystubPeriodRequest") + proto.RegisterType((*PaystubPeriodResponse)(nil), "multinode.PaystubPeriodResponse") + proto.RegisterType((*PaystubSatellitePeriodRequest)(nil), "multinode.PaystubSatellitePeriodRequest") + proto.RegisterType((*PaystubSatellitePeriodResponse)(nil), "multinode.PaystubSatellitePeriodResponse") proto.RegisterType((*PayoutInfo)(nil), "multinode.PayoutInfo") proto.RegisterType((*Paystub)(nil), "multinode.Paystub") proto.RegisterType((*HeldAmountHistoryRequest)(nil), "multinode.HeldAmountHistoryRequest") @@ -2137,107 +2137,106 @@ func init() { func init() { proto.RegisterFile("multinode.proto", fileDescriptor_9a45fd79b06f3a1b) } var fileDescriptor_9a45fd79b06f3a1b = []byte{ - // 1631 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x53, 0xdc, 0xc6, - 0x12, 0x7f, 0xe2, 0xcf, 0x2e, 0xf4, 0x2e, 0x2c, 0xcc, 0x03, 0x5b, 0xc8, 0x60, 0x78, 0x82, 0x87, - 0xf1, 0xb3, 0xbd, 0xbc, 0xe0, 0x94, 0xab, 0x52, 0xe5, 0x54, 0x0c, 0x31, 0x36, 0x54, 0xb0, 0x8d, - 0x05, 0x76, 0xa5, 0x9c, 0x94, 0x37, 0xc3, 0x6a, 0x58, 0x14, 0x6b, 0x25, 0x45, 0x9a, 0x25, 0xe1, - 0x92, 0x63, 0xce, 0x39, 0xa7, 0xf2, 0x5d, 0x52, 0xb9, 0xa4, 0x7c, 0xca, 0x07, 0xc8, 0xc1, 0xf9, - 0x0c, 0x39, 0xe5, 0x9a, 0x9a, 0x3f, 0xd2, 0x4a, 0xbb, 0xa3, 0x05, 0xef, 0xa6, 0x9c, 0x9b, 0xa6, - 0xfb, 0x37, 0xbf, 0xee, 0x99, 0xe9, 0x19, 0x75, 0x37, 0x54, 0x9a, 0x2d, 0x97, 0x3a, 0x9e, 0x6f, - 0x93, 0x6a, 0x10, 0xfa, 0xd4, 0x47, 0xe3, 0x89, 0xc0, 0x80, 0x86, 0xdf, 0xf0, 0x85, 0xd8, 0x58, - 0x6c, 0xf8, 0x7e, 0xc3, 0x25, 0xeb, 0x7c, 0x74, 0xd4, 0x3a, 0x5e, 0xa7, 0x4e, 0x93, 0x44, 0x14, - 0x37, 0x03, 0x01, 0x30, 0xd7, 0x60, 0xc2, 0x22, 0x5f, 0xb5, 0x48, 0x44, 0x77, 0x08, 0xb6, 0x49, - 0x88, 0x2e, 0x43, 0x11, 0x07, 0x4e, 0xed, 0x15, 0x39, 0xd3, 0xb5, 0x25, 0x6d, 0xad, 0x6c, 0x15, - 0x70, 0xe0, 0x7c, 0x42, 0xce, 0xcc, 0xfb, 0x30, 0x75, 0xdf, 0x89, 0x5e, 0x1d, 0x04, 0xb8, 0x4e, - 0xe4, 0x14, 0xf4, 0x7f, 0x28, 0x9c, 0xf0, 0x69, 0x1c, 0x5b, 0xda, 0xd0, 0xab, 0x6d, 0xbf, 0x32, - 0xb4, 0x96, 0xc4, 0x99, 0x3f, 0x69, 0x30, 0x9d, 0xa2, 0x89, 0x02, 0xdf, 0x8b, 0x08, 0x9a, 0x87, - 0x71, 0xec, 0xba, 0x7e, 0x1d, 0x53, 0x62, 0x73, 0xaa, 0x61, 0xab, 0x2d, 0x40, 0x8b, 0x50, 0x6a, - 0x45, 0xc4, 0xae, 0x05, 0x0e, 0xa9, 0x93, 0x48, 0x1f, 0xe2, 0x7a, 0x60, 0xa2, 0x7d, 0x2e, 0x41, - 0x0b, 0xc0, 0x47, 0x35, 0x1a, 0xe2, 0xe8, 0x44, 0x1f, 0x16, 0xf3, 0x99, 0xe4, 0x90, 0x09, 0x10, - 0x82, 0x91, 0xe3, 0x90, 0x10, 0x7d, 0x84, 0x2b, 0xf8, 0x37, 0xb7, 0x78, 0x8a, 0x1d, 0x17, 0x1f, - 0xb9, 0x44, 0x1f, 0x95, 0x16, 0x63, 0x01, 0x32, 0x60, 0xcc, 0x3f, 0x25, 0x21, 0xa3, 0xd0, 0x0b, - 0x5c, 0x99, 0x8c, 0xcd, 0x7d, 0x98, 0xdf, 0xc2, 0x9e, 0xfd, 0xb5, 0x63, 0xd3, 0x93, 0x47, 0xbe, - 0x47, 0x4f, 0x0e, 0x5a, 0xcd, 0x26, 0x0e, 0xcf, 0xfa, 0xdf, 0x93, 0xdb, 0xb0, 0x90, 0xc3, 0x28, - 0xb7, 0x07, 0xc1, 0x08, 0x77, 0x45, 0xec, 0x0c, 0xff, 0x36, 0xb7, 0x60, 0xf2, 0x39, 0x09, 0x23, - 0xc7, 0xf7, 0xfa, 0x37, 0x7c, 0x03, 0x2a, 0x09, 0x87, 0x34, 0xa5, 0x43, 0xf1, 0x54, 0x88, 0x38, - 0xcb, 0xb8, 0x15, 0x0f, 0xcd, 0x07, 0x80, 0xf6, 0x70, 0x44, 0x3f, 0xf6, 0x3d, 0x8a, 0xeb, 0xb4, - 0x7f, 0xa3, 0x2f, 0xe1, 0xdf, 0x19, 0x1e, 0x69, 0xf8, 0x21, 0x94, 0x5d, 0x1c, 0xd1, 0x5a, 0x5d, - 0xc8, 0x25, 0x9d, 0x51, 0x15, 0x01, 0x5c, 0x8d, 0x03, 0xb8, 0x7a, 0x18, 0x07, 0xf0, 0xd6, 0xd8, - 0xeb, 0x37, 0x8b, 0xff, 0xfa, 0xfe, 0xf7, 0x45, 0xcd, 0x2a, 0xb9, 0x6d, 0x42, 0xf3, 0x1b, 0x98, - 0xb6, 0x48, 0xd0, 0xa2, 0x98, 0x0e, 0xb2, 0x37, 0xe8, 0x3d, 0x28, 0x47, 0x98, 0x12, 0xd7, 0x75, - 0x28, 0xa9, 0x39, 0x36, 0x8f, 0xba, 0xf2, 0xd6, 0x24, 0xb3, 0xf9, 0xdb, 0x9b, 0xc5, 0xc2, 0x63, - 0xdf, 0x26, 0xbb, 0xf7, 0xad, 0x52, 0x82, 0xd9, 0xb5, 0xcd, 0x3f, 0x35, 0x40, 0x69, 0xd3, 0x72, - 0x65, 0x77, 0xa1, 0xe0, 0x7b, 0xae, 0xe3, 0x11, 0x69, 0x7b, 0x25, 0x63, 0xbb, 0x13, 0x5e, 0x7d, - 0xc2, 0xb1, 0x96, 0x9c, 0x83, 0x3e, 0x80, 0x51, 0xdc, 0xb2, 0x1d, 0xca, 0x1d, 0x28, 0x6d, 0x2c, - 0xf7, 0x9e, 0xbc, 0xc9, 0xa0, 0x96, 0x98, 0x61, 0x5c, 0x85, 0x82, 0x20, 0x43, 0x33, 0x30, 0x1a, - 0xd5, 0xfd, 0x50, 0x78, 0xa0, 0x59, 0x62, 0x60, 0xec, 0xc0, 0x28, 0xc7, 0xab, 0xd5, 0xe8, 0x3a, - 0x4c, 0x45, 0xad, 0x28, 0x20, 0x1e, 0x3b, 0xfe, 0x9a, 0x00, 0x0c, 0x71, 0x40, 0xa5, 0x2d, 0x3f, - 0x60, 0x62, 0x73, 0x0f, 0xf4, 0xc3, 0xb0, 0x15, 0x51, 0x62, 0x1f, 0xc4, 0xfb, 0x11, 0xf5, 0x1f, - 0x21, 0xbf, 0x68, 0x30, 0xa7, 0xa0, 0x93, 0xdb, 0xf9, 0x19, 0x20, 0x2a, 0x94, 0xb5, 0x64, 0xf3, - 0x23, 0x5d, 0x5b, 0x1a, 0x5e, 0x2b, 0x6d, 0xdc, 0x4c, 0x71, 0xe7, 0x32, 0x54, 0xd9, 0xd9, 0x3d, - 0xb3, 0xf6, 0xac, 0x69, 0xda, 0x09, 0x31, 0xf6, 0xa0, 0x28, 0xb5, 0xe8, 0x1a, 0x14, 0x19, 0x0f, - 0x3b, 0x7b, 0x4d, 0x79, 0xf6, 0x05, 0xa6, 0xde, 0xb5, 0xd9, 0x95, 0xc1, 0xb6, 0x1d, 0x92, 0x48, - 0x3c, 0x4d, 0xe3, 0x56, 0x3c, 0x34, 0xbf, 0xd3, 0x60, 0x71, 0x3b, 0xa2, 0x4e, 0x93, 0x3d, 0x63, - 0xfb, 0xf8, 0xcc, 0x6f, 0xd1, 0xc4, 0xd6, 0x3b, 0x8d, 0xcc, 0xa7, 0xb0, 0x94, 0xef, 0x87, 0xdc, - 0xd7, 0x5b, 0x80, 0x48, 0x8c, 0xa9, 0x11, 0x1c, 0x7a, 0x8e, 0xd7, 0x88, 0xe4, 0x93, 0x33, 0x9d, - 0x68, 0xb6, 0xa5, 0xc2, 0x7c, 0x02, 0x57, 0x3a, 0x28, 0x0f, 0x7d, 0x8a, 0xdd, 0xfe, 0x4f, 0xfd, - 0x11, 0xcc, 0xab, 0x09, 0xfb, 0xf6, 0x6f, 0xd3, 0x75, 0xdb, 0x47, 0x3b, 0xf0, 0x2b, 0xfd, 0x1c, - 0xe6, 0xd5, 0x84, 0xd2, 0xbf, 0x3b, 0x50, 0x0a, 0xb8, 0xdb, 0x35, 0xc7, 0x3b, 0xf6, 0x25, 0xed, - 0x6c, 0x8a, 0x56, 0x2c, 0x6a, 0xd7, 0x3b, 0xf6, 0x2d, 0x08, 0x92, 0x6f, 0xb3, 0x09, 0xff, 0xc9, - 0xf0, 0xee, 0x93, 0xd0, 0xf1, 0xed, 0x41, 0xdd, 0x45, 0x97, 0xa0, 0x10, 0x70, 0x26, 0x19, 0x94, - 0x72, 0x64, 0x7e, 0x0e, 0x66, 0x2f, 0x73, 0x03, 0x2e, 0xe6, 0x5b, 0xb8, 0x9c, 0x50, 0x0f, 0xbc, - 0x84, 0x3e, 0x02, 0xdd, 0x02, 0xbd, 0xdb, 0xfe, 0x80, 0x6b, 0xfa, 0x51, 0x83, 0x85, 0x84, 0xf4, - 0x6f, 0x3a, 0x9d, 0xb7, 0x5f, 0x5a, 0xea, 0x40, 0x87, 0x33, 0x07, 0xfa, 0x29, 0x5c, 0xcd, 0xf3, - 0x6e, 0xc0, 0x85, 0x6f, 0xc2, 0x04, 0xbb, 0x4e, 0xc4, 0xee, 0xff, 0xd2, 0xac, 0xc2, 0x64, 0x4c, - 0x21, 0x9d, 0x99, 0x81, 0x51, 0xca, 0xee, 0xb5, 0xbc, 0xb9, 0x62, 0x60, 0x3e, 0x82, 0x39, 0x81, - 0xdb, 0x27, 0xe1, 0xe0, 0x4f, 0xa4, 0x59, 0x07, 0x43, 0x45, 0x27, 0x5d, 0xd8, 0x86, 0x29, 0xc2, - 0xb5, 0xed, 0x1f, 0x88, 0xfc, 0x7f, 0x18, 0x29, 0x66, 0x41, 0xd0, 0x9e, 0x5d, 0x21, 0x59, 0x81, - 0xf9, 0x02, 0x2a, 0x1d, 0x18, 0xf5, 0xe2, 0xfa, 0x89, 0xe3, 0x1d, 0x98, 0x79, 0xe6, 0xd9, 0x4e, - 0x44, 0x43, 0xe7, 0xa8, 0x45, 0x07, 0x39, 0x81, 0x5b, 0x30, 0xdb, 0xc1, 0xd4, 0xf3, 0x20, 0xd2, - 0x17, 0x78, 0x1f, 0x9f, 0x45, 0xb4, 0x75, 0xf4, 0x4e, 0x2f, 0xf0, 0x4e, 0xea, 0x02, 0x27, 0xf6, - 0xa5, 0xc7, 0x37, 0xa1, 0x18, 0x08, 0x91, 0xf4, 0x00, 0x65, 0x63, 0x98, 0x83, 0x63, 0x08, 0x4b, - 0x90, 0x07, 0x5d, 0x80, 0xf9, 0x11, 0x54, 0x06, 0x73, 0xe2, 0x0b, 0x98, 0x11, 0x77, 0x72, 0xe0, - 0xbd, 0xcc, 0x7b, 0xcf, 0xb7, 0x61, 0xb6, 0xc3, 0x42, 0x5f, 0x8e, 0x2a, 0x1e, 0xb9, 0x7f, 0xe0, - 0xf8, 0x73, 0x1f, 0xb9, 0xc7, 0x5d, 0x8f, 0xdc, 0x60, 0xcb, 0x7d, 0x1f, 0xa0, 0xfd, 0xe8, 0xb1, - 0xfa, 0xea, 0x84, 0xb8, 0x49, 0x7d, 0xc5, 0xbe, 0x99, 0x2c, 0xc0, 0xd2, 0xe9, 0x61, 0x8b, 0x7f, - 0x9b, 0x7f, 0x0c, 0x41, 0x51, 0x52, 0x21, 0x13, 0x26, 0x5a, 0x11, 0x6e, 0x90, 0x1a, 0xa6, 0xb5, - 0x90, 0x44, 0x94, 0x17, 0x91, 0x9a, 0x55, 0xe2, 0xc2, 0x4d, 0x56, 0xd7, 0x50, 0x74, 0x05, 0xc6, - 0x05, 0xa6, 0x41, 0x68, 0x5c, 0x47, 0x72, 0xc1, 0x43, 0x42, 0xd1, 0x1a, 0x4c, 0x25, 0xca, 0x5a, - 0x48, 0x02, 0xec, 0x84, 0xfa, 0x18, 0xc7, 0x4c, 0xc6, 0x18, 0x8b, 0x4b, 0xd1, 0x2a, 0x54, 0xda, - 0x48, 0x51, 0x0c, 0x00, 0x07, 0x4e, 0xc4, 0x40, 0x91, 0xc6, 0x2f, 0x41, 0xb9, 0xee, 0x37, 0x83, - 0xc4, 0xa3, 0x92, 0x28, 0x94, 0x99, 0x4c, 0x3a, 0x34, 0x07, 0x63, 0x1c, 0xc1, 0xfc, 0x29, 0x73, - 0x6d, 0x91, 0x8d, 0x99, 0x3b, 0xab, 0x50, 0x89, 0x55, 0xb1, 0x37, 0x93, 0xc2, 0x88, 0x44, 0x48, - 0x67, 0x56, 0x60, 0x32, 0xc1, 0x09, 0x5f, 0xa6, 0x38, 0xac, 0x2c, 0x61, 0xc2, 0x95, 0x78, 0x47, - 0x91, 0x62, 0x47, 0x67, 0xdb, 0x3b, 0x8a, 0x96, 0xa0, 0x94, 0x7a, 0x9b, 0xf4, 0x4b, 0x5c, 0x95, - 0x16, 0xb1, 0xd2, 0x62, 0x87, 0xb8, 0xf6, 0x66, 0xd3, 0x6f, 0x79, 0x74, 0xc7, 0x89, 0xa8, 0x3f, - 0x48, 0x12, 0xf7, 0x7a, 0x08, 0xe6, 0x14, 0x74, 0x32, 0x86, 0xf6, 0xa1, 0x78, 0x22, 0x44, 0xf2, - 0x7f, 0x70, 0x27, 0x45, 0x98, 0x3b, 0x4d, 0xa1, 0x89, 0x69, 0x8c, 0xbb, 0x00, 0x6d, 0x6d, 0x2a, - 0xba, 0xb5, 0x74, 0x74, 0x33, 0x39, 0xe6, 0x08, 0x19, 0x6d, 0x72, 0x64, 0xfc, 0xa0, 0xc1, 0x74, - 0x17, 0x79, 0xd7, 0xb5, 0xd2, 0xce, 0xbf, 0x56, 0x16, 0x94, 0xd9, 0x11, 0xd4, 0x04, 0x2f, 0xab, - 0x53, 0xd8, 0xea, 0xd6, 0xdf, 0x72, 0x75, 0x56, 0xe9, 0x24, 0xf9, 0x8e, 0x36, 0x9e, 0x42, 0xf1, - 0x80, 0xfa, 0x21, 0x6e, 0x10, 0xf4, 0x00, 0xc6, 0x93, 0x9e, 0x0e, 0xba, 0x92, 0x62, 0xed, 0x6c, - 0x18, 0x19, 0xf3, 0x6a, 0xa5, 0x30, 0xb5, 0xe1, 0xc1, 0x78, 0xd2, 0x08, 0x41, 0x18, 0xca, 0xe9, - 0x66, 0x08, 0xba, 0x96, 0x9a, 0xda, 0xab, 0x01, 0x63, 0xac, 0x9d, 0x0f, 0x94, 0xf6, 0x7e, 0x1e, - 0x82, 0x11, 0xb6, 0x5d, 0xe8, 0x1e, 0x14, 0x65, 0x23, 0x04, 0xcd, 0xa5, 0x66, 0x67, 0x1b, 0x2c, - 0x86, 0xa1, 0x52, 0xc9, 0xd0, 0xd9, 0x83, 0x52, 0xaa, 0xab, 0x81, 0x16, 0x52, 0xd0, 0xee, 0xae, - 0x89, 0x71, 0x35, 0x4f, 0x2d, 0xd9, 0x76, 0x01, 0xda, 0xc5, 0x3d, 0x9a, 0xcf, 0xa9, 0xf9, 0x05, - 0xd7, 0x42, 0xcf, 0x8e, 0x00, 0x7a, 0x09, 0xd3, 0x5d, 0x95, 0x30, 0x5a, 0xee, 0x5d, 0x27, 0x0b, - 0xe2, 0x95, 0x8b, 0x14, 0xd3, 0x1b, 0xbf, 0x02, 0x14, 0xc4, 0x53, 0x8a, 0x1a, 0x30, 0xa3, 0xaa, - 0x90, 0xd0, 0x6a, 0x8a, 0xa8, 0x47, 0x4d, 0x66, 0x5c, 0x3b, 0x17, 0x27, 0xd7, 0x74, 0x06, 0x46, - 0x7e, 0x0d, 0x83, 0x6e, 0xe6, 0xd1, 0xa8, 0x72, 0x77, 0xe3, 0xd6, 0x05, 0xd1, 0x49, 0xf7, 0x61, - 0xaa, 0xb3, 0xc0, 0x40, 0x66, 0x8a, 0x22, 0xa7, 0xfa, 0x31, 0x96, 0x7b, 0x62, 0x24, 0x79, 0x13, - 0x2e, 0xa9, 0x53, 0x79, 0xb4, 0xa6, 0x9a, 0xae, 0x5c, 0xcf, 0xf5, 0x0b, 0x20, 0xa5, 0xb9, 0x0f, - 0xa1, 0x20, 0x12, 0x58, 0xa4, 0x77, 0xe5, 0xbd, 0x31, 0xdd, 0x9c, 0x42, 0x23, 0xa7, 0x63, 0x40, - 0xdd, 0x49, 0x36, 0x5a, 0xe9, 0x9a, 0xa0, 0x48, 0xe9, 0x8d, 0xff, 0x9e, 0x83, 0x92, 0x26, 0x22, - 0xd0, 0xf3, 0xfa, 0x16, 0xe8, 0x7f, 0x69, 0x8a, 0xde, 0x4d, 0x16, 0xe3, 0xc6, 0x85, 0xb0, 0xd2, - 0x68, 0x03, 0x66, 0x54, 0x8d, 0x88, 0x4c, 0x18, 0xf7, 0x68, 0x7d, 0x64, 0xc2, 0xb8, 0x67, 0x47, - 0xc3, 0x82, 0x89, 0x4c, 0x6a, 0x8e, 0x16, 0x53, 0x33, 0x55, 0xe9, 0xbf, 0xb1, 0x94, 0x0f, 0x50, - 0xc4, 0x67, 0x92, 0xaa, 0x28, 0x43, 0x22, 0x93, 0xdd, 0xa9, 0xe3, 0xb3, 0x33, 0xc7, 0xba, 0xd7, - 0x4e, 0x7f, 0xe6, 0x14, 0xd9, 0x95, 0xe2, 0x99, 0xec, 0x64, 0xb0, 0x60, 0x22, 0x93, 0xbe, 0x65, - 0x96, 0xac, 0x4a, 0x3b, 0x33, 0x4b, 0x56, 0x67, 0x7e, 0xdd, 0xb7, 0x26, 0x26, 0xef, 0x71, 0x6b, - 0x3a, 0xac, 0x5c, 0xbf, 0x00, 0xb2, 0xfd, 0xa0, 0x76, 0xff, 0x93, 0x97, 0x7b, 0xff, 0x4a, 0xbb, - 0x1f, 0xd4, 0xdc, 0xff, 0xed, 0xd6, 0xca, 0x0b, 0x93, 0x09, 0xbe, 0xac, 0x3a, 0xfe, 0x3a, 0xff, - 0x58, 0x0f, 0x42, 0xe7, 0x14, 0x53, 0xb2, 0x9e, 0xcc, 0x0e, 0x8e, 0x8e, 0x0a, 0xbc, 0x21, 0x7e, - 0xfb, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xad, 0x32, 0x36, 0xd4, 0x09, 0x1a, 0x00, 0x00, + // 1608 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0xdb, 0xc6, + 0x12, 0x7f, 0xf4, 0x87, 0x64, 0x8d, 0x64, 0xcb, 0xde, 0xe7, 0x0f, 0x9a, 0xf1, 0xd7, 0xa3, 0x8d, + 0xc4, 0x79, 0x49, 0xe4, 0xf7, 0x9c, 0x22, 0x40, 0x81, 0x14, 0x8d, 0xdd, 0x38, 0xb1, 0x5b, 0x37, + 0x71, 0xe8, 0xa4, 0x08, 0x12, 0x20, 0xca, 0xda, 0x5c, 0xcb, 0x6c, 0x24, 0x92, 0xe5, 0x2e, 0xdd, + 0xfa, 0x92, 0x63, 0xcf, 0x3d, 0x17, 0xfd, 0x5f, 0x8a, 0x5e, 0x8a, 0xfc, 0x0d, 0x3d, 0xa4, 0xe7, + 0x1e, 0x7b, 0xea, 0xb5, 0xd8, 0x0f, 0x52, 0x24, 0x45, 0x29, 0x89, 0x84, 0x36, 0xbd, 0x71, 0x67, + 0x7e, 0xfb, 0x9b, 0xd9, 0xd9, 0xd9, 0xe1, 0xec, 0x42, 0xb5, 0x15, 0x36, 0x99, 0xe3, 0x7a, 0x36, + 0xa9, 0xf9, 0x81, 0xc7, 0x3c, 0x54, 0x8a, 0x05, 0x06, 0x34, 0xbc, 0x86, 0x27, 0xc5, 0xc6, 0x72, + 0xc3, 0xf3, 0x1a, 0x4d, 0xb2, 0x21, 0x46, 0x47, 0xe1, 0xc9, 0x06, 0x73, 0x5a, 0x84, 0x32, 0xdc, + 0xf2, 0x25, 0xc0, 0x5c, 0x87, 0x71, 0x8b, 0x7c, 0x15, 0x12, 0xca, 0x76, 0x09, 0xb6, 0x49, 0x80, + 0xe6, 0xa0, 0x88, 0x7d, 0xa7, 0xfe, 0x82, 0x9c, 0xeb, 0xda, 0x8a, 0xb6, 0x5e, 0xb1, 0x0a, 0xd8, + 0x77, 0x3e, 0x23, 0xe7, 0xe6, 0x6d, 0x98, 0xbc, 0xed, 0xd0, 0x17, 0x87, 0x3e, 0x3e, 0x26, 0x6a, + 0x0a, 0xfa, 0x1f, 0x14, 0x4e, 0xc5, 0x34, 0x81, 0x2d, 0x6f, 0xea, 0xb5, 0xb6, 0x5f, 0x29, 0x5a, + 0x4b, 0xe1, 0xcc, 0x1f, 0x35, 0x98, 0x4a, 0xd0, 0x50, 0xdf, 0x73, 0x29, 0x41, 0x0b, 0x50, 0xc2, + 0xcd, 0xa6, 0x77, 0x8c, 0x19, 0xb1, 0x05, 0xd5, 0xb0, 0xd5, 0x16, 0xa0, 0x65, 0x28, 0x87, 0x94, + 0xd8, 0x75, 0xdf, 0x21, 0xc7, 0x84, 0xea, 0x43, 0x42, 0x0f, 0x5c, 0x74, 0x20, 0x24, 0x68, 0x11, + 0xc4, 0xa8, 0xce, 0x02, 0x4c, 0x4f, 0xf5, 0x61, 0x39, 0x9f, 0x4b, 0x1e, 0x72, 0x01, 0x42, 0x30, + 0x72, 0x12, 0x10, 0xa2, 0x8f, 0x08, 0x85, 0xf8, 0x16, 0x16, 0xcf, 0xb0, 0xd3, 0xc4, 0x47, 0x4d, + 0xa2, 0x8f, 0x2a, 0x8b, 0x91, 0x00, 0x19, 0x30, 0xe6, 0x9d, 0x91, 0x80, 0x53, 0xe8, 0x05, 0xa1, + 0x8c, 0xc7, 0xe6, 0x01, 0x2c, 0x6c, 0x63, 0xd7, 0xfe, 0xda, 0xb1, 0xd9, 0xe9, 0xe7, 0x9e, 0xcb, + 0x4e, 0x0f, 0xc3, 0x56, 0x0b, 0x07, 0xe7, 0xfd, 0xc7, 0xe4, 0x3a, 0x2c, 0x76, 0x61, 0x54, 0xe1, + 0x41, 0x30, 0x22, 0x5c, 0x91, 0x91, 0x11, 0xdf, 0xe6, 0x36, 0x4c, 0x7c, 0x41, 0x02, 0xea, 0x78, + 0x6e, 0xff, 0x86, 0xaf, 0x40, 0x35, 0xe6, 0x50, 0xa6, 0x74, 0x28, 0x9e, 0x49, 0x91, 0x60, 0x29, + 0x59, 0xd1, 0xd0, 0xbc, 0x03, 0x68, 0x1f, 0x53, 0xf6, 0x89, 0xe7, 0x32, 0x7c, 0xcc, 0xfa, 0x37, + 0xfa, 0x0c, 0xfe, 0x9d, 0xe2, 0x51, 0x86, 0xef, 0x42, 0xa5, 0x89, 0x29, 0xab, 0x1f, 0x4b, 0xb9, + 0xa2, 0x33, 0x6a, 0x32, 0x81, 0x6b, 0x51, 0x02, 0xd7, 0x1e, 0x46, 0x09, 0xbc, 0x3d, 0xf6, 0xea, + 0xf5, 0xf2, 0xbf, 0xbe, 0xfb, 0x75, 0x59, 0xb3, 0xca, 0xcd, 0x36, 0xa1, 0xf9, 0x0d, 0x4c, 0x59, + 0xc4, 0x0f, 0x19, 0x66, 0x83, 0xc4, 0x06, 0xfd, 0x1f, 0x2a, 0x14, 0x33, 0xd2, 0x6c, 0x3a, 0x8c, + 0xd4, 0x1d, 0x5b, 0x64, 0x5d, 0x65, 0x7b, 0x82, 0xdb, 0xfc, 0xe5, 0xf5, 0x72, 0xe1, 0x9e, 0x67, + 0x93, 0xbd, 0xdb, 0x56, 0x39, 0xc6, 0xec, 0xd9, 0xe6, 0x1f, 0x1a, 0xa0, 0xa4, 0x69, 0xb5, 0xb2, + 0x9b, 0x50, 0xf0, 0xdc, 0xa6, 0xe3, 0x12, 0x65, 0x7b, 0x2d, 0x65, 0x3b, 0x0b, 0xaf, 0xdd, 0x17, + 0x58, 0x4b, 0xcd, 0x41, 0x1f, 0xc2, 0x28, 0x0e, 0x6d, 0x87, 0x09, 0x07, 0xca, 0x9b, 0xab, 0xbd, + 0x27, 0x6f, 0x71, 0xa8, 0x25, 0x67, 0x18, 0x4b, 0x50, 0x90, 0x64, 0x68, 0x1a, 0x46, 0xe9, 0xb1, + 0x17, 0x48, 0x0f, 0x34, 0x4b, 0x0e, 0x8c, 0x5d, 0x18, 0x15, 0xf8, 0x7c, 0x35, 0xba, 0x0c, 0x93, + 0x34, 0xa4, 0x3e, 0x71, 0xf9, 0xf6, 0xd7, 0x25, 0x60, 0x48, 0x00, 0xaa, 0x6d, 0xf9, 0x21, 0x17, + 0x9b, 0xfb, 0xa0, 0x3f, 0x0c, 0x42, 0xca, 0x88, 0x7d, 0x18, 0xc5, 0x83, 0xf6, 0x9f, 0x21, 0x3f, + 0x6b, 0x30, 0x9f, 0x43, 0xa7, 0xc2, 0xf9, 0x14, 0x10, 0x93, 0xca, 0x7a, 0x1c, 0x7c, 0xaa, 0x6b, + 0x2b, 0xc3, 0xeb, 0xe5, 0xcd, 0xab, 0x09, 0xee, 0xae, 0x0c, 0x35, 0xbe, 0x77, 0x8f, 0xac, 0x7d, + 0x6b, 0x8a, 0x65, 0x21, 0xc6, 0x3e, 0x14, 0x95, 0x16, 0x5d, 0x82, 0x22, 0xe7, 0xe1, 0x7b, 0xaf, + 0xe5, 0xee, 0x7d, 0x81, 0xab, 0xf7, 0x6c, 0x7e, 0x64, 0xb0, 0x6d, 0x07, 0x84, 0xca, 0xd2, 0x54, + 0xb2, 0xa2, 0xa1, 0xf9, 0xad, 0x06, 0xcb, 0x3b, 0x94, 0x39, 0x2d, 0x5e, 0xc6, 0x0e, 0xf0, 0xb9, + 0x17, 0xb2, 0xd8, 0xd6, 0xdf, 0x9a, 0x99, 0x0f, 0x60, 0xa5, 0xbb, 0x1f, 0x2a, 0xae, 0xd7, 0x00, + 0x91, 0x08, 0x53, 0x27, 0x38, 0x70, 0x1d, 0xb7, 0x41, 0x55, 0xc9, 0x99, 0x8a, 0x35, 0x3b, 0x4a, + 0x61, 0x7e, 0x0a, 0xb3, 0x19, 0xca, 0xfe, 0x37, 0x7c, 0x17, 0xe6, 0x3a, 0xb8, 0xfa, 0xf3, 0x6a, + 0x1b, 0x26, 0x06, 0x2e, 0xc7, 0x7b, 0x50, 0xcd, 0x16, 0xe0, 0x1b, 0x50, 0xf6, 0x85, 0x5f, 0x75, + 0xc7, 0x3d, 0xf1, 0x14, 0xd3, 0x4c, 0x82, 0x49, 0x7a, 0xbd, 0xe7, 0x9e, 0x78, 0x16, 0xf8, 0xf1, + 0xb7, 0xf9, 0x1c, 0xa6, 0x15, 0xd5, 0x01, 0x09, 0x1c, 0xcf, 0xee, 0x7f, 0xd3, 0x67, 0xa1, 0xe0, + 0x0b, 0x0a, 0x95, 0x63, 0x6a, 0x64, 0xde, 0x87, 0x99, 0x8c, 0x85, 0x01, 0x5d, 0x7e, 0x09, 0x73, + 0x8a, 0xf0, 0xfd, 0xa4, 0xaa, 0x05, 0x7a, 0xa7, 0xfd, 0x01, 0xd7, 0xf4, 0x83, 0x06, 0x8b, 0x59, + 0xd2, 0x41, 0x37, 0xe4, 0xdd, 0x97, 0x96, 0xd8, 0xc3, 0xe1, 0xd4, 0x1e, 0x3e, 0x86, 0xa5, 0x6e, + 0xde, 0x0d, 0xb8, 0xf0, 0x2d, 0x18, 0xe7, 0x47, 0x83, 0xf4, 0xbf, 0x4e, 0xf3, 0x22, 0x4c, 0x44, + 0x14, 0xca, 0x99, 0x69, 0x18, 0x65, 0x1e, 0xc3, 0x4d, 0x75, 0x0a, 0xe5, 0x40, 0xd4, 0x03, 0x81, + 0x1b, 0x3c, 0x6d, 0xcc, 0xe7, 0x30, 0xd7, 0xc1, 0xa5, 0x8c, 0xef, 0xc0, 0x24, 0x11, 0xaa, 0x76, + 0xf1, 0x57, 0xb5, 0xdf, 0x48, 0xd0, 0x66, 0x67, 0x57, 0x49, 0x5a, 0x60, 0x3e, 0x81, 0x6a, 0x06, + 0x93, 0xbf, 0xac, 0x7e, 0x32, 0x78, 0x17, 0xa6, 0x1f, 0xb9, 0xb6, 0x43, 0x59, 0xe0, 0x1c, 0x85, + 0x6c, 0x90, 0xd8, 0x5f, 0x83, 0x99, 0x0c, 0x53, 0xcf, 0x2d, 0x78, 0x09, 0x73, 0x07, 0xf8, 0x9c, + 0xb2, 0xf0, 0xe8, 0xfd, 0x1c, 0xdd, 0x5d, 0xd0, 0x3b, 0xed, 0x2b, 0x8f, 0xaf, 0x42, 0xd1, 0x97, + 0x3a, 0xe5, 0x01, 0x4a, 0x67, 0x2f, 0xd7, 0x58, 0x11, 0x84, 0x97, 0xf1, 0x48, 0xd6, 0x77, 0xf0, + 0x3e, 0x86, 0x6a, 0xcc, 0xd1, 0x97, 0x13, 0xcf, 0x61, 0x5a, 0xc9, 0xfe, 0xaa, 0xe2, 0xbd, 0x03, + 0x33, 0x19, 0x0b, 0x7d, 0x39, 0xca, 0xcb, 0x5b, 0x36, 0xf0, 0xff, 0xa0, 0xf2, 0x76, 0x0f, 0x96, + 0xba, 0x79, 0xd7, 0xd7, 0x72, 0x3f, 0x00, 0x68, 0x97, 0x3b, 0x7e, 0x37, 0x3a, 0x25, 0xcd, 0xf8, + 0x6e, 0xc4, 0xbf, 0xb9, 0xcc, 0xc7, 0xca, 0xe9, 0x61, 0x4b, 0x7c, 0x9b, 0xbf, 0x0f, 0x41, 0x51, + 0x51, 0x21, 0x13, 0xc6, 0x43, 0x8a, 0x1b, 0xa4, 0x8e, 0x59, 0x3d, 0x20, 0x94, 0x89, 0x0b, 0xa0, + 0x66, 0x95, 0x85, 0x70, 0x8b, 0x37, 0x1f, 0x0c, 0x5d, 0x80, 0x92, 0xc4, 0x34, 0x08, 0x8b, 0xee, + 0x80, 0x42, 0x70, 0x97, 0x30, 0xb4, 0x0e, 0x93, 0xb1, 0xb2, 0x1e, 0x10, 0x1f, 0x3b, 0x81, 0x3e, + 0x26, 0x30, 0x13, 0x11, 0xc6, 0x12, 0x52, 0x74, 0x11, 0xaa, 0x6d, 0xa4, 0x6c, 0xe4, 0x41, 0x00, + 0xc7, 0x23, 0xa0, 0x6c, 0xc1, 0x57, 0xa0, 0x72, 0xec, 0xb5, 0xfc, 0xd8, 0xa3, 0xb2, 0xbc, 0xe4, + 0x72, 0x99, 0x72, 0x68, 0x1e, 0xc6, 0x04, 0x82, 0xfb, 0x53, 0x11, 0xda, 0x22, 0x1f, 0x73, 0x77, + 0x2e, 0x42, 0x35, 0x52, 0x45, 0xde, 0x4c, 0x48, 0x23, 0x0a, 0xa1, 0x9c, 0x59, 0x83, 0x89, 0x18, + 0x27, 0x7d, 0x99, 0x14, 0xb0, 0x8a, 0x82, 0x49, 0x57, 0xa2, 0x88, 0xa2, 0x9c, 0x88, 0xce, 0xb4, + 0x23, 0x8a, 0x56, 0xa0, 0x9c, 0xa8, 0x4d, 0xfa, 0xac, 0x50, 0x25, 0x45, 0xfc, 0x5a, 0xb0, 0x4b, + 0x9a, 0xf6, 0x56, 0xcb, 0x0b, 0x5d, 0xb6, 0xeb, 0x50, 0xe6, 0x0d, 0xd2, 0x97, 0xbd, 0x1a, 0x82, + 0xf9, 0x1c, 0x3a, 0x95, 0x43, 0x07, 0x50, 0x3c, 0x95, 0x22, 0xf5, 0x3f, 0xb8, 0x91, 0x20, 0xec, + 0x3a, 0x2d, 0x47, 0x13, 0xd1, 0x18, 0x37, 0x01, 0xda, 0xda, 0x44, 0x76, 0x6b, 0xc9, 0xec, 0xe6, + 0x72, 0x2c, 0x10, 0x2a, 0xdb, 0xd4, 0xc8, 0xf8, 0x5e, 0x83, 0xa9, 0x0e, 0xf2, 0x8e, 0x63, 0xa5, + 0xbd, 0xf9, 0x58, 0x59, 0x50, 0xe1, 0x5b, 0x50, 0x97, 0xbc, 0xfc, 0x8e, 0xc1, 0x57, 0xb7, 0xf1, + 0x8e, 0xab, 0xb3, 0xca, 0xa7, 0xf1, 0x37, 0xdd, 0x7c, 0x00, 0xc5, 0x43, 0xe6, 0x05, 0xb8, 0x41, + 0xd0, 0x1d, 0x28, 0xc5, 0xef, 0x31, 0xe8, 0x42, 0x82, 0x35, 0xfb, 0xd8, 0x63, 0x2c, 0xe4, 0x2b, + 0xa5, 0xa9, 0x4d, 0x17, 0x4a, 0xf1, 0x23, 0x06, 0xc2, 0x50, 0x49, 0x3e, 0x64, 0xa0, 0x4b, 0x89, + 0xa9, 0xbd, 0x1e, 0x4f, 0x8c, 0xf5, 0x37, 0x03, 0x95, 0xbd, 0x9f, 0x86, 0x60, 0x84, 0x87, 0x0b, + 0xdd, 0x82, 0xa2, 0x7a, 0xc4, 0x40, 0xf3, 0x89, 0xd9, 0xe9, 0xc7, 0x11, 0xc3, 0xc8, 0x53, 0xa9, + 0xd4, 0xd9, 0x87, 0x72, 0xe2, 0x45, 0x02, 0x2d, 0x26, 0xa0, 0x9d, 0x2f, 0x1e, 0xc6, 0x52, 0x37, + 0xb5, 0x62, 0xdb, 0x03, 0x68, 0x5f, 0xcc, 0xd1, 0x42, 0x97, 0xfb, 0xba, 0xe4, 0x5a, 0xec, 0x79, + 0x9b, 0x47, 0xcf, 0x60, 0xaa, 0xe3, 0x16, 0x8b, 0x56, 0x7b, 0xdf, 0x71, 0x25, 0xf1, 0xda, 0xdb, + 0x5c, 0x84, 0x37, 0x7f, 0x2b, 0x89, 0x9a, 0xe8, 0x85, 0x8c, 0xf2, 0x30, 0x46, 0xbb, 0x95, 0x0c, + 0x63, 0x66, 0x7f, 0x8c, 0x3c, 0x95, 0xf2, 0xd6, 0x82, 0xf1, 0xd4, 0x55, 0x04, 0x2d, 0x77, 0x82, + 0x53, 0xbf, 0x25, 0x63, 0xa5, 0x3b, 0x20, 0xbe, 0xec, 0x4f, 0x66, 0x5b, 0x63, 0x64, 0x76, 0xce, + 0xca, 0xf6, 0x3b, 0xc6, 0x6a, 0x4f, 0x8c, 0x22, 0x6f, 0xc1, 0x6c, 0x7e, 0xdf, 0x8d, 0xd6, 0x7b, + 0x4c, 0x4f, 0x2f, 0xe1, 0xf2, 0x5b, 0x20, 0x95, 0xb9, 0x8f, 0xa0, 0x20, 0x7b, 0x4e, 0xa4, 0x77, + 0xb4, 0xaa, 0x11, 0xdd, 0x7c, 0x8e, 0x46, 0x4d, 0x7f, 0xdc, 0xd9, 0xb2, 0xfe, 0xa7, 0x47, 0xcb, + 0xab, 0x08, 0xcd, 0x5e, 0x10, 0xc5, 0x4c, 0x41, 0xef, 0xf6, 0x3a, 0x80, 0xfe, 0x9b, 0x9c, 0xdf, + 0xfb, 0x29, 0xc3, 0xb8, 0xf2, 0x56, 0xd8, 0xc4, 0x72, 0xd2, 0x98, 0xf4, 0x72, 0x72, 0xdf, 0x16, + 0xd2, 0xcb, 0xe9, 0xf2, 0x64, 0x60, 0xc1, 0x78, 0xaa, 0x6b, 0x4e, 0xe5, 0x61, 0x5e, 0x67, 0x9e, + 0xca, 0xc3, 0xfc, 0x86, 0xfb, 0x29, 0x4c, 0x66, 0x7b, 0x98, 0x54, 0x1e, 0x76, 0xe9, 0xbb, 0x53, + 0x79, 0xd8, 0xb5, 0x37, 0xbe, 0xd5, 0xee, 0x4c, 0xe6, 0x73, 0x1a, 0x9f, 0x9c, 0xa3, 0x97, 0x6d, + 0x6c, 0x2d, 0x18, 0x4f, 0x35, 0x92, 0xa9, 0x25, 0xe7, 0x35, 0xb1, 0xa9, 0x25, 0xe7, 0xf7, 0xa0, + 0x2d, 0x98, 0xcd, 0x6f, 0xdb, 0x52, 0xa7, 0xa3, 0x67, 0xdf, 0x99, 0x3a, 0x1d, 0x6f, 0xe8, 0x01, + 0x9f, 0xe5, 0xfd, 0x2e, 0x57, 0x7b, 0xff, 0xe5, 0x3a, 0x6b, 0x5d, 0xd7, 0x5f, 0xe1, 0xf6, 0xda, + 0x13, 0x93, 0x0b, 0xbe, 0xac, 0x39, 0xde, 0x86, 0xf8, 0xd8, 0xf0, 0x03, 0xe7, 0x0c, 0x33, 0xb2, + 0x11, 0xcf, 0xf6, 0x8f, 0x8e, 0x0a, 0xe2, 0x9d, 0xf9, 0xfa, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x83, 0x12, 0xc9, 0x30, 0x60, 0x19, 0x00, 0x00, } diff --git a/private/multinodepb/multinode.proto b/private/multinodepb/multinode.proto index dffd355e8..f45d8b61f 100644 --- a/private/multinodepb/multinode.proto +++ b/private/multinodepb/multinode.proto @@ -96,20 +96,20 @@ message TrustedSatellitesResponse { repeated NodeURL trusted_satellites = 1; } -service Payout { - rpc AllSatellitesSummary(AllSatellitesSummaryRequest) returns (AllSatellitesSummaryResponse); - rpc AllSatellitesPeriodSummary(AllSatellitesPeriodSummaryRequest) returns (AllSatellitesPeriodSummaryResponse); - rpc SatelliteSummary(SatelliteSummaryRequest) returns (SatelliteSummaryResponse); - rpc SatellitePeriodSummary(SatellitePeriodSummaryRequest) returns (SatellitePeriodSummaryResponse); +service Payouts { + rpc Summary(SummaryRequest) returns (SummaryResponse); + rpc SummaryPeriod(SummaryPeriodRequest) returns (SummaryPeriodResponse); + rpc SummarySatellite(SummarySatelliteRequest) returns (SummarySatelliteResponse); + rpc SummarySatellitePeriod(SummarySatellitePeriodRequest) returns (SummarySatellitePeriodResponse); rpc Earned(EarnedRequest) returns (EarnedResponse); - rpc EarnedPerSatellite(EarnedPerSatelliteRequest) returns (EarnedPerSatelliteResponse); + rpc EarnedSatellite(EarnedSatelliteRequest) returns (EarnedSatelliteResponse); rpc EstimatedPayoutSatellite(EstimatedPayoutSatelliteRequest) returns (EstimatedPayoutSatelliteResponse); - rpc EstimatedPayoutTotal(EstimatedPayoutTotalRequest) returns (EstimatedPayoutTotalResponse); + rpc EstimatedPayout(EstimatedPayoutRequest) returns (EstimatedPayoutResponse); rpc Undistributed(UndistributedRequest) returns (UndistributedResponse); - rpc SatellitePaystub(SatellitePaystubRequest) returns (SatellitePaystubResponse); + rpc PaystubSatellite(PaystubSatelliteRequest) returns (PaystubSatelliteResponse); rpc Paystub(PaystubRequest) returns (PaystubResponse); - rpc PeriodPaystub(PeriodPaystubRequest) returns (PeriodPaystubResponse); - rpc SatellitePeriodPaystub(SatellitePeriodPaystubRequest) returns (SatellitePeriodPaystubResponse); + rpc PaystubPeriod(PaystubPeriodRequest) returns (PaystubPeriodResponse); + rpc PaystubSatellitePeriod(PaystubSatellitePeriodRequest) returns (PaystubSatellitePeriodResponse); rpc HeldAmountHistory(HeldAmountHistoryRequest) returns (HeldAmountHistoryResponse); } @@ -122,47 +122,47 @@ message EstimatedPayoutSatelliteResponse { int64 estimated_earnings = 1; } -message EstimatedPayoutTotalRequest { +message EstimatedPayoutRequest { RequestHeader header = 1; } -message EstimatedPayoutTotalResponse { +message EstimatedPayoutResponse { int64 estimated_earnings = 1; } -message AllSatellitesSummaryRequest { +message SummaryRequest { RequestHeader header = 1; } -message AllSatellitesSummaryResponse { +message SummaryResponse { PayoutInfo payout_info = 1; } -message AllSatellitesPeriodSummaryRequest { +message SummaryPeriodRequest { RequestHeader header = 1; string period = 2; } -message AllSatellitesPeriodSummaryResponse { +message SummaryPeriodResponse { PayoutInfo payout_info = 1; } -message SatelliteSummaryRequest { +message SummarySatelliteRequest { RequestHeader header = 1; bytes satellite_id = 2 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false]; } -message SatelliteSummaryResponse { +message SummarySatelliteResponse { PayoutInfo payout_info = 1; } -message SatellitePeriodSummaryRequest { +message SummarySatellitePeriodRequest { RequestHeader header = 1; bytes satellite_id = 2 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false]; string period = 3; } -message SatellitePeriodSummaryResponse { +message SummarySatellitePeriodResponse { PayoutInfo payout_info = 1; } @@ -174,11 +174,11 @@ message EarnedResponse { int64 total = 1; } -message EarnedPerSatelliteRequest { +message EarnedSatelliteRequest { RequestHeader header = 1; } -message EarnedPerSatelliteResponse { +message EarnedSatelliteResponse { repeated EarnedSatellite earned_satellite = 1; } @@ -195,11 +195,11 @@ message UndistributedResponse { int64 total = 1; } -message SatellitePaystubRequest { +message PaystubSatelliteRequest { RequestHeader header = 1; bytes satellite_id = 2 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false]; } -message SatellitePaystubResponse { +message PaystubSatelliteResponse { Paystub paystub = 1; } message PaystubRequest { @@ -209,22 +209,22 @@ message PaystubResponse { Paystub paystub = 1; } -message PeriodPaystubRequest { +message PaystubPeriodRequest { RequestHeader header = 1; string period = 2; } -message PeriodPaystubResponse { +message PaystubPeriodResponse { Paystub paystub = 1; } -message SatellitePeriodPaystubRequest { +message PaystubSatellitePeriodRequest { RequestHeader header = 1; bytes satellite_id = 2 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false]; string period = 3; } -message SatellitePeriodPaystubResponse { +message PaystubSatellitePeriodResponse { Paystub paystub = 1; } diff --git a/private/multinodepb/multinode_drpc.pb.go b/private/multinodepb/multinode_drpc.pb.go index 373563398..49f4447ad 100644 --- a/private/multinodepb/multinode_drpc.pb.go +++ b/private/multinodepb/multinode_drpc.pb.go @@ -384,595 +384,595 @@ func (x *drpcNode_TrustedSatellitesStream) SendAndClose(m *TrustedSatellitesResp return x.CloseSend() } -type DRPCPayoutClient interface { +type DRPCPayoutsClient interface { DRPCConn() drpc.Conn - AllSatellitesSummary(ctx context.Context, in *AllSatellitesSummaryRequest) (*AllSatellitesSummaryResponse, error) - AllSatellitesPeriodSummary(ctx context.Context, in *AllSatellitesPeriodSummaryRequest) (*AllSatellitesPeriodSummaryResponse, error) - SatelliteSummary(ctx context.Context, in *SatelliteSummaryRequest) (*SatelliteSummaryResponse, error) - SatellitePeriodSummary(ctx context.Context, in *SatellitePeriodSummaryRequest) (*SatellitePeriodSummaryResponse, error) + Summary(ctx context.Context, in *SummaryRequest) (*SummaryResponse, error) + SummaryPeriod(ctx context.Context, in *SummaryPeriodRequest) (*SummaryPeriodResponse, error) + SummarySatellite(ctx context.Context, in *SummarySatelliteRequest) (*SummarySatelliteResponse, error) + SummarySatellitePeriod(ctx context.Context, in *SummarySatellitePeriodRequest) (*SummarySatellitePeriodResponse, error) Earned(ctx context.Context, in *EarnedRequest) (*EarnedResponse, error) - EarnedPerSatellite(ctx context.Context, in *EarnedPerSatelliteRequest) (*EarnedPerSatelliteResponse, error) + EarnedSatellite(ctx context.Context, in *EarnedSatelliteRequest) (*EarnedSatelliteResponse, error) EstimatedPayoutSatellite(ctx context.Context, in *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error) - EstimatedPayoutTotal(ctx context.Context, in *EstimatedPayoutTotalRequest) (*EstimatedPayoutTotalResponse, error) + EstimatedPayout(ctx context.Context, in *EstimatedPayoutRequest) (*EstimatedPayoutResponse, error) Undistributed(ctx context.Context, in *UndistributedRequest) (*UndistributedResponse, error) - SatellitePaystub(ctx context.Context, in *SatellitePaystubRequest) (*SatellitePaystubResponse, error) + PaystubSatellite(ctx context.Context, in *PaystubSatelliteRequest) (*PaystubSatelliteResponse, error) Paystub(ctx context.Context, in *PaystubRequest) (*PaystubResponse, error) - PeriodPaystub(ctx context.Context, in *PeriodPaystubRequest) (*PeriodPaystubResponse, error) - SatellitePeriodPaystub(ctx context.Context, in *SatellitePeriodPaystubRequest) (*SatellitePeriodPaystubResponse, error) + PaystubPeriod(ctx context.Context, in *PaystubPeriodRequest) (*PaystubPeriodResponse, error) + PaystubSatellitePeriod(ctx context.Context, in *PaystubSatellitePeriodRequest) (*PaystubSatellitePeriodResponse, error) HeldAmountHistory(ctx context.Context, in *HeldAmountHistoryRequest) (*HeldAmountHistoryResponse, error) } -type drpcPayoutClient struct { +type drpcPayoutsClient struct { cc drpc.Conn } -func NewDRPCPayoutClient(cc drpc.Conn) DRPCPayoutClient { - return &drpcPayoutClient{cc} +func NewDRPCPayoutsClient(cc drpc.Conn) DRPCPayoutsClient { + return &drpcPayoutsClient{cc} } -func (c *drpcPayoutClient) DRPCConn() drpc.Conn { return c.cc } +func (c *drpcPayoutsClient) DRPCConn() drpc.Conn { return c.cc } -func (c *drpcPayoutClient) AllSatellitesSummary(ctx context.Context, in *AllSatellitesSummaryRequest) (*AllSatellitesSummaryResponse, error) { - out := new(AllSatellitesSummaryResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/AllSatellitesSummary", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) Summary(ctx context.Context, in *SummaryRequest) (*SummaryResponse, error) { + out := new(SummaryResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/Summary", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) AllSatellitesPeriodSummary(ctx context.Context, in *AllSatellitesPeriodSummaryRequest) (*AllSatellitesPeriodSummaryResponse, error) { - out := new(AllSatellitesPeriodSummaryResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/AllSatellitesPeriodSummary", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) SummaryPeriod(ctx context.Context, in *SummaryPeriodRequest) (*SummaryPeriodResponse, error) { + out := new(SummaryPeriodResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/SummaryPeriod", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) SatelliteSummary(ctx context.Context, in *SatelliteSummaryRequest) (*SatelliteSummaryResponse, error) { - out := new(SatelliteSummaryResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/SatelliteSummary", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) SummarySatellite(ctx context.Context, in *SummarySatelliteRequest) (*SummarySatelliteResponse, error) { + out := new(SummarySatelliteResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/SummarySatellite", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) SatellitePeriodSummary(ctx context.Context, in *SatellitePeriodSummaryRequest) (*SatellitePeriodSummaryResponse, error) { - out := new(SatellitePeriodSummaryResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/SatellitePeriodSummary", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) SummarySatellitePeriod(ctx context.Context, in *SummarySatellitePeriodRequest) (*SummarySatellitePeriodResponse, error) { + out := new(SummarySatellitePeriodResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/SummarySatellitePeriod", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) Earned(ctx context.Context, in *EarnedRequest) (*EarnedResponse, error) { +func (c *drpcPayoutsClient) Earned(ctx context.Context, in *EarnedRequest) (*EarnedResponse, error) { out := new(EarnedResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/Earned", drpcEncoding_File_multinode_proto{}, in, out) + err := c.cc.Invoke(ctx, "/multinode.Payouts/Earned", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) EarnedPerSatellite(ctx context.Context, in *EarnedPerSatelliteRequest) (*EarnedPerSatelliteResponse, error) { - out := new(EarnedPerSatelliteResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/EarnedPerSatellite", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) EarnedSatellite(ctx context.Context, in *EarnedSatelliteRequest) (*EarnedSatelliteResponse, error) { + out := new(EarnedSatelliteResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/EarnedSatellite", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) EstimatedPayoutSatellite(ctx context.Context, in *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error) { +func (c *drpcPayoutsClient) EstimatedPayoutSatellite(ctx context.Context, in *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error) { out := new(EstimatedPayoutSatelliteResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/EstimatedPayoutSatellite", drpcEncoding_File_multinode_proto{}, in, out) + err := c.cc.Invoke(ctx, "/multinode.Payouts/EstimatedPayoutSatellite", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) EstimatedPayoutTotal(ctx context.Context, in *EstimatedPayoutTotalRequest) (*EstimatedPayoutTotalResponse, error) { - out := new(EstimatedPayoutTotalResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/EstimatedPayoutTotal", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) EstimatedPayout(ctx context.Context, in *EstimatedPayoutRequest) (*EstimatedPayoutResponse, error) { + out := new(EstimatedPayoutResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/EstimatedPayout", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) Undistributed(ctx context.Context, in *UndistributedRequest) (*UndistributedResponse, error) { +func (c *drpcPayoutsClient) Undistributed(ctx context.Context, in *UndistributedRequest) (*UndistributedResponse, error) { out := new(UndistributedResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/Undistributed", drpcEncoding_File_multinode_proto{}, in, out) + err := c.cc.Invoke(ctx, "/multinode.Payouts/Undistributed", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) SatellitePaystub(ctx context.Context, in *SatellitePaystubRequest) (*SatellitePaystubResponse, error) { - out := new(SatellitePaystubResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/SatellitePaystub", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) PaystubSatellite(ctx context.Context, in *PaystubSatelliteRequest) (*PaystubSatelliteResponse, error) { + out := new(PaystubSatelliteResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/PaystubSatellite", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) Paystub(ctx context.Context, in *PaystubRequest) (*PaystubResponse, error) { +func (c *drpcPayoutsClient) Paystub(ctx context.Context, in *PaystubRequest) (*PaystubResponse, error) { out := new(PaystubResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/Paystub", drpcEncoding_File_multinode_proto{}, in, out) + err := c.cc.Invoke(ctx, "/multinode.Payouts/Paystub", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) PeriodPaystub(ctx context.Context, in *PeriodPaystubRequest) (*PeriodPaystubResponse, error) { - out := new(PeriodPaystubResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/PeriodPaystub", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) PaystubPeriod(ctx context.Context, in *PaystubPeriodRequest) (*PaystubPeriodResponse, error) { + out := new(PaystubPeriodResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/PaystubPeriod", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) SatellitePeriodPaystub(ctx context.Context, in *SatellitePeriodPaystubRequest) (*SatellitePeriodPaystubResponse, error) { - out := new(SatellitePeriodPaystubResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/SatellitePeriodPaystub", drpcEncoding_File_multinode_proto{}, in, out) +func (c *drpcPayoutsClient) PaystubSatellitePeriod(ctx context.Context, in *PaystubSatellitePeriodRequest) (*PaystubSatellitePeriodResponse, error) { + out := new(PaystubSatellitePeriodResponse) + err := c.cc.Invoke(ctx, "/multinode.Payouts/PaystubSatellitePeriod", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -func (c *drpcPayoutClient) HeldAmountHistory(ctx context.Context, in *HeldAmountHistoryRequest) (*HeldAmountHistoryResponse, error) { +func (c *drpcPayoutsClient) HeldAmountHistory(ctx context.Context, in *HeldAmountHistoryRequest) (*HeldAmountHistoryResponse, error) { out := new(HeldAmountHistoryResponse) - err := c.cc.Invoke(ctx, "/multinode.Payout/HeldAmountHistory", drpcEncoding_File_multinode_proto{}, in, out) + err := c.cc.Invoke(ctx, "/multinode.Payouts/HeldAmountHistory", drpcEncoding_File_multinode_proto{}, in, out) if err != nil { return nil, err } return out, nil } -type DRPCPayoutServer interface { - AllSatellitesSummary(context.Context, *AllSatellitesSummaryRequest) (*AllSatellitesSummaryResponse, error) - AllSatellitesPeriodSummary(context.Context, *AllSatellitesPeriodSummaryRequest) (*AllSatellitesPeriodSummaryResponse, error) - SatelliteSummary(context.Context, *SatelliteSummaryRequest) (*SatelliteSummaryResponse, error) - SatellitePeriodSummary(context.Context, *SatellitePeriodSummaryRequest) (*SatellitePeriodSummaryResponse, error) +type DRPCPayoutsServer interface { + Summary(context.Context, *SummaryRequest) (*SummaryResponse, error) + SummaryPeriod(context.Context, *SummaryPeriodRequest) (*SummaryPeriodResponse, error) + SummarySatellite(context.Context, *SummarySatelliteRequest) (*SummarySatelliteResponse, error) + SummarySatellitePeriod(context.Context, *SummarySatellitePeriodRequest) (*SummarySatellitePeriodResponse, error) Earned(context.Context, *EarnedRequest) (*EarnedResponse, error) - EarnedPerSatellite(context.Context, *EarnedPerSatelliteRequest) (*EarnedPerSatelliteResponse, error) + EarnedSatellite(context.Context, *EarnedSatelliteRequest) (*EarnedSatelliteResponse, error) EstimatedPayoutSatellite(context.Context, *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error) - EstimatedPayoutTotal(context.Context, *EstimatedPayoutTotalRequest) (*EstimatedPayoutTotalResponse, error) + EstimatedPayout(context.Context, *EstimatedPayoutRequest) (*EstimatedPayoutResponse, error) Undistributed(context.Context, *UndistributedRequest) (*UndistributedResponse, error) - SatellitePaystub(context.Context, *SatellitePaystubRequest) (*SatellitePaystubResponse, error) + PaystubSatellite(context.Context, *PaystubSatelliteRequest) (*PaystubSatelliteResponse, error) Paystub(context.Context, *PaystubRequest) (*PaystubResponse, error) - PeriodPaystub(context.Context, *PeriodPaystubRequest) (*PeriodPaystubResponse, error) - SatellitePeriodPaystub(context.Context, *SatellitePeriodPaystubRequest) (*SatellitePeriodPaystubResponse, error) + PaystubPeriod(context.Context, *PaystubPeriodRequest) (*PaystubPeriodResponse, error) + PaystubSatellitePeriod(context.Context, *PaystubSatellitePeriodRequest) (*PaystubSatellitePeriodResponse, error) HeldAmountHistory(context.Context, *HeldAmountHistoryRequest) (*HeldAmountHistoryResponse, error) } -type DRPCPayoutUnimplementedServer struct{} +type DRPCPayoutsUnimplementedServer struct{} -func (s *DRPCPayoutUnimplementedServer) AllSatellitesSummary(context.Context, *AllSatellitesSummaryRequest) (*AllSatellitesSummaryResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) Summary(context.Context, *SummaryRequest) (*SummaryResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) AllSatellitesPeriodSummary(context.Context, *AllSatellitesPeriodSummaryRequest) (*AllSatellitesPeriodSummaryResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) SummaryPeriod(context.Context, *SummaryPeriodRequest) (*SummaryPeriodResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) SatelliteSummary(context.Context, *SatelliteSummaryRequest) (*SatelliteSummaryResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) SummarySatellite(context.Context, *SummarySatelliteRequest) (*SummarySatelliteResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) SatellitePeriodSummary(context.Context, *SatellitePeriodSummaryRequest) (*SatellitePeriodSummaryResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) SummarySatellitePeriod(context.Context, *SummarySatellitePeriodRequest) (*SummarySatellitePeriodResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) Earned(context.Context, *EarnedRequest) (*EarnedResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) Earned(context.Context, *EarnedRequest) (*EarnedResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) EarnedPerSatellite(context.Context, *EarnedPerSatelliteRequest) (*EarnedPerSatelliteResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) EarnedSatellite(context.Context, *EarnedSatelliteRequest) (*EarnedSatelliteResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) EstimatedPayoutSatellite(context.Context, *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) EstimatedPayoutSatellite(context.Context, *EstimatedPayoutSatelliteRequest) (*EstimatedPayoutSatelliteResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) EstimatedPayoutTotal(context.Context, *EstimatedPayoutTotalRequest) (*EstimatedPayoutTotalResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) EstimatedPayout(context.Context, *EstimatedPayoutRequest) (*EstimatedPayoutResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) Undistributed(context.Context, *UndistributedRequest) (*UndistributedResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) Undistributed(context.Context, *UndistributedRequest) (*UndistributedResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) SatellitePaystub(context.Context, *SatellitePaystubRequest) (*SatellitePaystubResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) PaystubSatellite(context.Context, *PaystubSatelliteRequest) (*PaystubSatelliteResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) Paystub(context.Context, *PaystubRequest) (*PaystubResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) Paystub(context.Context, *PaystubRequest) (*PaystubResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) PeriodPaystub(context.Context, *PeriodPaystubRequest) (*PeriodPaystubResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) PaystubPeriod(context.Context, *PaystubPeriodRequest) (*PaystubPeriodResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) SatellitePeriodPaystub(context.Context, *SatellitePeriodPaystubRequest) (*SatellitePeriodPaystubResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) PaystubSatellitePeriod(context.Context, *PaystubSatellitePeriodRequest) (*PaystubSatellitePeriodResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -func (s *DRPCPayoutUnimplementedServer) HeldAmountHistory(context.Context, *HeldAmountHistoryRequest) (*HeldAmountHistoryResponse, error) { +func (s *DRPCPayoutsUnimplementedServer) HeldAmountHistory(context.Context, *HeldAmountHistoryRequest) (*HeldAmountHistoryResponse, error) { return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12) } -type DRPCPayoutDescription struct{} +type DRPCPayoutsDescription struct{} -func (DRPCPayoutDescription) NumMethods() int { return 14 } +func (DRPCPayoutsDescription) NumMethods() int { return 14 } -func (DRPCPayoutDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { +func (DRPCPayoutsDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { case 0: - return "/multinode.Payout/AllSatellitesSummary", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/Summary", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - AllSatellitesSummary( + return srv.(DRPCPayoutsServer). + Summary( ctx, - in1.(*AllSatellitesSummaryRequest), + in1.(*SummaryRequest), ) - }, DRPCPayoutServer.AllSatellitesSummary, true + }, DRPCPayoutsServer.Summary, true case 1: - return "/multinode.Payout/AllSatellitesPeriodSummary", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/SummaryPeriod", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - AllSatellitesPeriodSummary( + return srv.(DRPCPayoutsServer). + SummaryPeriod( ctx, - in1.(*AllSatellitesPeriodSummaryRequest), + in1.(*SummaryPeriodRequest), ) - }, DRPCPayoutServer.AllSatellitesPeriodSummary, true + }, DRPCPayoutsServer.SummaryPeriod, true case 2: - return "/multinode.Payout/SatelliteSummary", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/SummarySatellite", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - SatelliteSummary( + return srv.(DRPCPayoutsServer). + SummarySatellite( ctx, - in1.(*SatelliteSummaryRequest), + in1.(*SummarySatelliteRequest), ) - }, DRPCPayoutServer.SatelliteSummary, true + }, DRPCPayoutsServer.SummarySatellite, true case 3: - return "/multinode.Payout/SatellitePeriodSummary", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/SummarySatellitePeriod", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - SatellitePeriodSummary( + return srv.(DRPCPayoutsServer). + SummarySatellitePeriod( ctx, - in1.(*SatellitePeriodSummaryRequest), + in1.(*SummarySatellitePeriodRequest), ) - }, DRPCPayoutServer.SatellitePeriodSummary, true + }, DRPCPayoutsServer.SummarySatellitePeriod, true case 4: - return "/multinode.Payout/Earned", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/Earned", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). + return srv.(DRPCPayoutsServer). Earned( ctx, in1.(*EarnedRequest), ) - }, DRPCPayoutServer.Earned, true + }, DRPCPayoutsServer.Earned, true case 5: - return "/multinode.Payout/EarnedPerSatellite", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/EarnedSatellite", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - EarnedPerSatellite( + return srv.(DRPCPayoutsServer). + EarnedSatellite( ctx, - in1.(*EarnedPerSatelliteRequest), + in1.(*EarnedSatelliteRequest), ) - }, DRPCPayoutServer.EarnedPerSatellite, true + }, DRPCPayoutsServer.EarnedSatellite, true case 6: - return "/multinode.Payout/EstimatedPayoutSatellite", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/EstimatedPayoutSatellite", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). + return srv.(DRPCPayoutsServer). EstimatedPayoutSatellite( ctx, in1.(*EstimatedPayoutSatelliteRequest), ) - }, DRPCPayoutServer.EstimatedPayoutSatellite, true + }, DRPCPayoutsServer.EstimatedPayoutSatellite, true case 7: - return "/multinode.Payout/EstimatedPayoutTotal", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/EstimatedPayout", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - EstimatedPayoutTotal( + return srv.(DRPCPayoutsServer). + EstimatedPayout( ctx, - in1.(*EstimatedPayoutTotalRequest), + in1.(*EstimatedPayoutRequest), ) - }, DRPCPayoutServer.EstimatedPayoutTotal, true + }, DRPCPayoutsServer.EstimatedPayout, true case 8: - return "/multinode.Payout/Undistributed", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/Undistributed", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). + return srv.(DRPCPayoutsServer). Undistributed( ctx, in1.(*UndistributedRequest), ) - }, DRPCPayoutServer.Undistributed, true + }, DRPCPayoutsServer.Undistributed, true case 9: - return "/multinode.Payout/SatellitePaystub", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/PaystubSatellite", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - SatellitePaystub( + return srv.(DRPCPayoutsServer). + PaystubSatellite( ctx, - in1.(*SatellitePaystubRequest), + in1.(*PaystubSatelliteRequest), ) - }, DRPCPayoutServer.SatellitePaystub, true + }, DRPCPayoutsServer.PaystubSatellite, true case 10: - return "/multinode.Payout/Paystub", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/Paystub", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). + return srv.(DRPCPayoutsServer). Paystub( ctx, in1.(*PaystubRequest), ) - }, DRPCPayoutServer.Paystub, true + }, DRPCPayoutsServer.Paystub, true case 11: - return "/multinode.Payout/PeriodPaystub", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/PaystubPeriod", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - PeriodPaystub( + return srv.(DRPCPayoutsServer). + PaystubPeriod( ctx, - in1.(*PeriodPaystubRequest), + in1.(*PaystubPeriodRequest), ) - }, DRPCPayoutServer.PeriodPaystub, true + }, DRPCPayoutsServer.PaystubPeriod, true case 12: - return "/multinode.Payout/SatellitePeriodPaystub", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/PaystubSatellitePeriod", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). - SatellitePeriodPaystub( + return srv.(DRPCPayoutsServer). + PaystubSatellitePeriod( ctx, - in1.(*SatellitePeriodPaystubRequest), + in1.(*PaystubSatellitePeriodRequest), ) - }, DRPCPayoutServer.SatellitePeriodPaystub, true + }, DRPCPayoutsServer.PaystubSatellitePeriod, true case 13: - return "/multinode.Payout/HeldAmountHistory", drpcEncoding_File_multinode_proto{}, + return "/multinode.Payouts/HeldAmountHistory", drpcEncoding_File_multinode_proto{}, func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { - return srv.(DRPCPayoutServer). + return srv.(DRPCPayoutsServer). HeldAmountHistory( ctx, in1.(*HeldAmountHistoryRequest), ) - }, DRPCPayoutServer.HeldAmountHistory, true + }, DRPCPayoutsServer.HeldAmountHistory, true default: return "", nil, nil, nil, false } } -func DRPCRegisterPayout(mux drpc.Mux, impl DRPCPayoutServer) error { - return mux.Register(impl, DRPCPayoutDescription{}) +func DRPCRegisterPayouts(mux drpc.Mux, impl DRPCPayoutsServer) error { + return mux.Register(impl, DRPCPayoutsDescription{}) } -type DRPCPayout_AllSatellitesSummaryStream interface { +type DRPCPayouts_SummaryStream interface { drpc.Stream - SendAndClose(*AllSatellitesSummaryResponse) error + SendAndClose(*SummaryResponse) error } -type drpcPayout_AllSatellitesSummaryStream struct { +type drpcPayouts_SummaryStream struct { drpc.Stream } -func (x *drpcPayout_AllSatellitesSummaryStream) SendAndClose(m *AllSatellitesSummaryResponse) error { +func (x *drpcPayouts_SummaryStream) SendAndClose(m *SummaryResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_AllSatellitesPeriodSummaryStream interface { +type DRPCPayouts_SummaryPeriodStream interface { drpc.Stream - SendAndClose(*AllSatellitesPeriodSummaryResponse) error + SendAndClose(*SummaryPeriodResponse) error } -type drpcPayout_AllSatellitesPeriodSummaryStream struct { +type drpcPayouts_SummaryPeriodStream struct { drpc.Stream } -func (x *drpcPayout_AllSatellitesPeriodSummaryStream) SendAndClose(m *AllSatellitesPeriodSummaryResponse) error { +func (x *drpcPayouts_SummaryPeriodStream) SendAndClose(m *SummaryPeriodResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_SatelliteSummaryStream interface { +type DRPCPayouts_SummarySatelliteStream interface { drpc.Stream - SendAndClose(*SatelliteSummaryResponse) error + SendAndClose(*SummarySatelliteResponse) error } -type drpcPayout_SatelliteSummaryStream struct { +type drpcPayouts_SummarySatelliteStream struct { drpc.Stream } -func (x *drpcPayout_SatelliteSummaryStream) SendAndClose(m *SatelliteSummaryResponse) error { +func (x *drpcPayouts_SummarySatelliteStream) SendAndClose(m *SummarySatelliteResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_SatellitePeriodSummaryStream interface { +type DRPCPayouts_SummarySatellitePeriodStream interface { drpc.Stream - SendAndClose(*SatellitePeriodSummaryResponse) error + SendAndClose(*SummarySatellitePeriodResponse) error } -type drpcPayout_SatellitePeriodSummaryStream struct { +type drpcPayouts_SummarySatellitePeriodStream struct { drpc.Stream } -func (x *drpcPayout_SatellitePeriodSummaryStream) SendAndClose(m *SatellitePeriodSummaryResponse) error { +func (x *drpcPayouts_SummarySatellitePeriodStream) SendAndClose(m *SummarySatellitePeriodResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_EarnedStream interface { +type DRPCPayouts_EarnedStream interface { drpc.Stream SendAndClose(*EarnedResponse) error } -type drpcPayout_EarnedStream struct { +type drpcPayouts_EarnedStream struct { drpc.Stream } -func (x *drpcPayout_EarnedStream) SendAndClose(m *EarnedResponse) error { +func (x *drpcPayouts_EarnedStream) SendAndClose(m *EarnedResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_EarnedPerSatelliteStream interface { +type DRPCPayouts_EarnedSatelliteStream interface { drpc.Stream - SendAndClose(*EarnedPerSatelliteResponse) error + SendAndClose(*EarnedSatelliteResponse) error } -type drpcPayout_EarnedPerSatelliteStream struct { +type drpcPayouts_EarnedSatelliteStream struct { drpc.Stream } -func (x *drpcPayout_EarnedPerSatelliteStream) SendAndClose(m *EarnedPerSatelliteResponse) error { +func (x *drpcPayouts_EarnedSatelliteStream) SendAndClose(m *EarnedSatelliteResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_EstimatedPayoutSatelliteStream interface { +type DRPCPayouts_EstimatedPayoutSatelliteStream interface { drpc.Stream SendAndClose(*EstimatedPayoutSatelliteResponse) error } -type drpcPayout_EstimatedPayoutSatelliteStream struct { +type drpcPayouts_EstimatedPayoutSatelliteStream struct { drpc.Stream } -func (x *drpcPayout_EstimatedPayoutSatelliteStream) SendAndClose(m *EstimatedPayoutSatelliteResponse) error { +func (x *drpcPayouts_EstimatedPayoutSatelliteStream) SendAndClose(m *EstimatedPayoutSatelliteResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_EstimatedPayoutTotalStream interface { +type DRPCPayouts_EstimatedPayoutStream interface { drpc.Stream - SendAndClose(*EstimatedPayoutTotalResponse) error + SendAndClose(*EstimatedPayoutResponse) error } -type drpcPayout_EstimatedPayoutTotalStream struct { +type drpcPayouts_EstimatedPayoutStream struct { drpc.Stream } -func (x *drpcPayout_EstimatedPayoutTotalStream) SendAndClose(m *EstimatedPayoutTotalResponse) error { +func (x *drpcPayouts_EstimatedPayoutStream) SendAndClose(m *EstimatedPayoutResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_UndistributedStream interface { +type DRPCPayouts_UndistributedStream interface { drpc.Stream SendAndClose(*UndistributedResponse) error } -type drpcPayout_UndistributedStream struct { +type drpcPayouts_UndistributedStream struct { drpc.Stream } -func (x *drpcPayout_UndistributedStream) SendAndClose(m *UndistributedResponse) error { +func (x *drpcPayouts_UndistributedStream) SendAndClose(m *UndistributedResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_SatellitePaystubStream interface { +type DRPCPayouts_PaystubSatelliteStream interface { drpc.Stream - SendAndClose(*SatellitePaystubResponse) error + SendAndClose(*PaystubSatelliteResponse) error } -type drpcPayout_SatellitePaystubStream struct { +type drpcPayouts_PaystubSatelliteStream struct { drpc.Stream } -func (x *drpcPayout_SatellitePaystubStream) SendAndClose(m *SatellitePaystubResponse) error { +func (x *drpcPayouts_PaystubSatelliteStream) SendAndClose(m *PaystubSatelliteResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_PaystubStream interface { +type DRPCPayouts_PaystubStream interface { drpc.Stream SendAndClose(*PaystubResponse) error } -type drpcPayout_PaystubStream struct { +type drpcPayouts_PaystubStream struct { drpc.Stream } -func (x *drpcPayout_PaystubStream) SendAndClose(m *PaystubResponse) error { +func (x *drpcPayouts_PaystubStream) SendAndClose(m *PaystubResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_PeriodPaystubStream interface { +type DRPCPayouts_PaystubPeriodStream interface { drpc.Stream - SendAndClose(*PeriodPaystubResponse) error + SendAndClose(*PaystubPeriodResponse) error } -type drpcPayout_PeriodPaystubStream struct { +type drpcPayouts_PaystubPeriodStream struct { drpc.Stream } -func (x *drpcPayout_PeriodPaystubStream) SendAndClose(m *PeriodPaystubResponse) error { +func (x *drpcPayouts_PaystubPeriodStream) SendAndClose(m *PaystubPeriodResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_SatellitePeriodPaystubStream interface { +type DRPCPayouts_PaystubSatellitePeriodStream interface { drpc.Stream - SendAndClose(*SatellitePeriodPaystubResponse) error + SendAndClose(*PaystubSatellitePeriodResponse) error } -type drpcPayout_SatellitePeriodPaystubStream struct { +type drpcPayouts_PaystubSatellitePeriodStream struct { drpc.Stream } -func (x *drpcPayout_SatellitePeriodPaystubStream) SendAndClose(m *SatellitePeriodPaystubResponse) error { +func (x *drpcPayouts_PaystubSatellitePeriodStream) SendAndClose(m *PaystubSatellitePeriodResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } return x.CloseSend() } -type DRPCPayout_HeldAmountHistoryStream interface { +type DRPCPayouts_HeldAmountHistoryStream interface { drpc.Stream SendAndClose(*HeldAmountHistoryResponse) error } -type drpcPayout_HeldAmountHistoryStream struct { +type drpcPayouts_HeldAmountHistoryStream struct { drpc.Stream } -func (x *drpcPayout_HeldAmountHistoryStream) SendAndClose(m *HeldAmountHistoryResponse) error { +func (x *drpcPayouts_HeldAmountHistoryStream) SendAndClose(m *HeldAmountHistoryResponse) error { if err := x.MsgSend(m, drpcEncoding_File_multinode_proto{}); err != nil { return err } diff --git a/proto.lock b/proto.lock index 2669762d3..fb9fc1a7d 100644 --- a/proto.lock +++ b/proto.lock @@ -480,6 +480,10 @@ { "name": "java_outer_classname", "value": "GoGoProtos" + }, + { + "name": "go_package", + "value": "storj.io/storj/private/multinodepb" } ] } @@ -728,6 +732,181 @@ } ] }, + { + "name": "EstimatedPayoutSatelliteRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "satellite_id", + "type": "bytes", + "options": [ + { + "name": "(gogoproto.customtype)", + "value": "NodeID" + }, + { + "name": "(gogoproto.nullable)", + "value": "false" + } + ] + } + ] + }, + { + "name": "EstimatedPayoutSatelliteResponse", + "fields": [ + { + "id": 1, + "name": "estimated_earnings", + "type": "int64" + } + ] + }, + { + "name": "EstimatedPayoutRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + } + ] + }, + { + "name": "EstimatedPayoutResponse", + "fields": [ + { + "id": 1, + "name": "estimated_earnings", + "type": "int64" + } + ] + }, + { + "name": "SummaryRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + } + ] + }, + { + "name": "SummaryResponse", + "fields": [ + { + "id": 1, + "name": "payout_info", + "type": "PayoutInfo" + } + ] + }, + { + "name": "SummaryPeriodRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "period", + "type": "string" + } + ] + }, + { + "name": "SummaryPeriodResponse", + "fields": [ + { + "id": 1, + "name": "payout_info", + "type": "PayoutInfo" + } + ] + }, + { + "name": "SummarySatelliteRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "satellite_id", + "type": "bytes", + "options": [ + { + "name": "(gogoproto.customtype)", + "value": "NodeID" + }, + { + "name": "(gogoproto.nullable)", + "value": "false" + } + ] + } + ] + }, + { + "name": "SummarySatelliteResponse", + "fields": [ + { + "id": 1, + "name": "payout_info", + "type": "PayoutInfo" + } + ] + }, + { + "name": "SummarySatellitePeriodRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "satellite_id", + "type": "bytes", + "options": [ + { + "name": "(gogoproto.customtype)", + "value": "NodeID" + }, + { + "name": "(gogoproto.nullable)", + "value": "false" + } + ] + }, + { + "id": 3, + "name": "period", + "type": "string" + } + ] + }, + { + "name": "SummarySatellitePeriodResponse", + "fields": [ + { + "id": 1, + "name": "payout_info", + "type": "PayoutInfo" + } + ] + }, { "name": "EarnedRequest", "fields": [ @@ -749,7 +928,7 @@ ] }, { - "name": "EarnedPerSatelliteRequest", + "name": "EarnedSatelliteRequest", "fields": [ { "id": 1, @@ -759,7 +938,7 @@ ] }, { - "name": "EarnedPerSatelliteResponse", + "name": "EarnedSatelliteResponse", "fields": [ { "id": 1, @@ -793,6 +972,285 @@ ] } ] + }, + { + "name": "UndistributedRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + } + ] + }, + { + "name": "UndistributedResponse", + "fields": [ + { + "id": 1, + "name": "total", + "type": "int64" + } + ] + }, + { + "name": "PaystubSatelliteRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "satellite_id", + "type": "bytes", + "options": [ + { + "name": "(gogoproto.customtype)", + "value": "NodeID" + }, + { + "name": "(gogoproto.nullable)", + "value": "false" + } + ] + } + ] + }, + { + "name": "PaystubSatelliteResponse", + "fields": [ + { + "id": 1, + "name": "paystub", + "type": "Paystub" + } + ] + }, + { + "name": "PaystubRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + } + ] + }, + { + "name": "PaystubResponse", + "fields": [ + { + "id": 1, + "name": "paystub", + "type": "Paystub" + } + ] + }, + { + "name": "PaystubPeriodRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "period", + "type": "string" + } + ] + }, + { + "name": "PaystubPeriodResponse", + "fields": [ + { + "id": 1, + "name": "paystub", + "type": "Paystub" + } + ] + }, + { + "name": "PaystubSatellitePeriodRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + }, + { + "id": 2, + "name": "satellite_id", + "type": "bytes", + "options": [ + { + "name": "(gogoproto.customtype)", + "value": "NodeID" + }, + { + "name": "(gogoproto.nullable)", + "value": "false" + } + ] + }, + { + "id": 3, + "name": "period", + "type": "string" + } + ] + }, + { + "name": "PaystubSatellitePeriodResponse", + "fields": [ + { + "id": 1, + "name": "paystub", + "type": "Paystub" + } + ] + }, + { + "name": "PayoutInfo", + "fields": [ + { + "id": 1, + "name": "held", + "type": "int64" + }, + { + "id": 2, + "name": "paid", + "type": "int64" + } + ] + }, + { + "name": "Paystub", + "fields": [ + { + "id": 5, + "name": "usage_at_rest", + "type": "double" + }, + { + "id": 6, + "name": "usage_get", + "type": "int64" + }, + { + "id": 8, + "name": "usage_get_repair", + "type": "int64" + }, + { + "id": 10, + "name": "usage_get_audit", + "type": "int64" + }, + { + "id": 11, + "name": "comp_at_rest", + "type": "int64" + }, + { + "id": 12, + "name": "comp_get", + "type": "int64" + }, + { + "id": 14, + "name": "comp_get_repair", + "type": "int64" + }, + { + "id": 16, + "name": "comp_get_audit", + "type": "int64" + }, + { + "id": 18, + "name": "held", + "type": "int64" + }, + { + "id": 21, + "name": "paid", + "type": "int64" + }, + { + "id": 22, + "name": "distributed", + "type": "int64" + } + ] + }, + { + "name": "HeldAmountHistoryRequest", + "fields": [ + { + "id": 1, + "name": "header", + "type": "RequestHeader" + } + ] + }, + { + "name": "HeldAmountHistoryResponse", + "fields": [ + { + "id": 1, + "name": "history", + "type": "HeldAmountHistory", + "is_repeated": true + } + ], + "messages": [ + { + "name": "HeldAmount", + "fields": [ + { + "id": 1, + "name": "period", + "type": "string" + }, + { + "id": 2, + "name": "amount", + "type": "int64" + } + ] + }, + { + "name": "HeldAmountHistory", + "fields": [ + { + "id": 1, + "name": "satellite_id", + "type": "bytes", + "options": [ + { + "name": "(gogoproto.customtype)", + "value": "NodeID" + }, + { + "name": "(gogoproto.nullable)", + "value": "false" + } + ] + }, + { + "id": 2, + "name": "held_amounts", + "type": "HeldAmount", + "is_repeated": true + } + ] + } + ] } ], "services": [ @@ -842,17 +1300,77 @@ ] }, { - "name": "Payout", + "name": "Payouts", "rpcs": [ + { + "name": "Summary", + "in_type": "SummaryRequest", + "out_type": "SummaryResponse" + }, + { + "name": "SummaryPeriod", + "in_type": "SummaryPeriodRequest", + "out_type": "SummaryPeriodResponse" + }, + { + "name": "SummarySatellite", + "in_type": "SummarySatelliteRequest", + "out_type": "SummarySatelliteResponse" + }, + { + "name": "SummarySatellitePeriod", + "in_type": "SummarySatellitePeriodRequest", + "out_type": "SummarySatellitePeriodResponse" + }, { "name": "Earned", "in_type": "EarnedRequest", "out_type": "EarnedResponse" }, { - "name": "EarnedPerSatellite", - "in_type": "EarnedPerSatelliteRequest", - "out_type": "EarnedPerSatelliteResponse" + "name": "EarnedSatellite", + "in_type": "EarnedSatelliteRequest", + "out_type": "EarnedSatelliteResponse" + }, + { + "name": "EstimatedPayoutSatellite", + "in_type": "EstimatedPayoutSatelliteRequest", + "out_type": "EstimatedPayoutSatelliteResponse" + }, + { + "name": "EstimatedPayout", + "in_type": "EstimatedPayoutRequest", + "out_type": "EstimatedPayoutResponse" + }, + { + "name": "Undistributed", + "in_type": "UndistributedRequest", + "out_type": "UndistributedResponse" + }, + { + "name": "PaystubSatellite", + "in_type": "PaystubSatelliteRequest", + "out_type": "PaystubSatelliteResponse" + }, + { + "name": "Paystub", + "in_type": "PaystubRequest", + "out_type": "PaystubResponse" + }, + { + "name": "PaystubPeriod", + "in_type": "PaystubPeriodRequest", + "out_type": "PaystubPeriodResponse" + }, + { + "name": "PaystubSatellitePeriod", + "in_type": "PaystubSatellitePeriodRequest", + "out_type": "PaystubSatellitePeriodResponse" + }, + { + "name": "HeldAmountHistory", + "in_type": "HeldAmountHistoryRequest", + "out_type": "HeldAmountHistoryResponse" } ] } diff --git a/storagenode/multinode/payout.go b/storagenode/multinode/payout.go index 0431096c9..897885c2d 100644 --- a/storagenode/multinode/payout.go +++ b/storagenode/multinode/payout.go @@ -16,13 +16,13 @@ import ( "storj.io/storj/storagenode/payouts/estimatedpayouts" ) -var _ multinodepb.DRPCPayoutServer = (*PayoutEndpoint)(nil) +var _ multinodepb.DRPCPayoutsServer = (*PayoutEndpoint)(nil) // PayoutEndpoint implements multinode payouts endpoint. // // architecture: Endpoint type PayoutEndpoint struct { - multinodepb.DRPCPayoutUnimplementedServer + multinodepb.DRPCPayoutsUnimplementedServer log *zap.Logger apiKeys *apikeys.Service @@ -60,15 +60,15 @@ func (payout *PayoutEndpoint) Earned(ctx context.Context, req *multinodepb.Earne }, nil } -// EarnedPerSatellite returns total earned amount per satellite. -func (payout *PayoutEndpoint) EarnedPerSatellite(ctx context.Context, req *multinodepb.EarnedPerSatelliteRequest) (_ *multinodepb.EarnedPerSatelliteResponse, err error) { +// EarnedSatellite returns total earned amount per satellite. +func (payout *PayoutEndpoint) EarnedSatellite(ctx context.Context, req *multinodepb.EarnedSatelliteRequest) (_ *multinodepb.EarnedSatelliteResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { return nil, rpcstatus.Wrap(rpcstatus.Unauthenticated, err) } - var resp multinodepb.EarnedPerSatelliteResponse + var resp multinodepb.EarnedSatelliteResponse satelliteIDs, err := payout.db.GetPayingSatellitesIDs(ctx) if err != nil { return nil, rpcstatus.Wrap(rpcstatus.Internal, err) @@ -89,8 +89,8 @@ func (payout *PayoutEndpoint) EarnedPerSatellite(ctx context.Context, req *multi return &resp, nil } -// EstimatedPayoutTotal returns estimated earnings for current month from all satellites. -func (payout *PayoutEndpoint) EstimatedPayoutTotal(ctx context.Context, req *multinodepb.EstimatedPayoutTotalRequest) (_ *multinodepb.EstimatedPayoutTotalResponse, err error) { +// EstimatedPayout returns estimated earnings for current month from all satellites. +func (payout *PayoutEndpoint) EstimatedPayout(ctx context.Context, req *multinodepb.EstimatedPayoutRequest) (_ *multinodepb.EstimatedPayoutResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -99,10 +99,10 @@ func (payout *PayoutEndpoint) EstimatedPayoutTotal(ctx context.Context, req *mul estimated, err := payout.estimatedPayouts.GetAllSatellitesEstimatedPayout(ctx, time.Now()) if err != nil { - return &multinodepb.EstimatedPayoutTotalResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.EstimatedPayoutResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } - return &multinodepb.EstimatedPayoutTotalResponse{EstimatedEarnings: estimated.CurrentMonthExpectations}, nil + return &multinodepb.EstimatedPayoutResponse{EstimatedEarnings: estimated.CurrentMonthExpectations}, nil } // EstimatedPayoutSatellite returns estimated earnings for current month from specific satellite. @@ -121,8 +121,8 @@ func (payout *PayoutEndpoint) EstimatedPayoutSatellite(ctx context.Context, req return &multinodepb.EstimatedPayoutSatelliteResponse{EstimatedEarnings: estimated.CurrentMonthExpectations}, nil } -// AllSatellitesSummary returns all satellites all time payout summary. -func (payout *PayoutEndpoint) AllSatellitesSummary(ctx context.Context, req *multinodepb.AllSatellitesSummaryRequest) (_ *multinodepb.AllSatellitesSummaryResponse, err error) { +// Summary returns all satellites all time payout summary. +func (payout *PayoutEndpoint) Summary(ctx context.Context, req *multinodepb.SummaryRequest) (_ *multinodepb.SummaryResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -132,24 +132,24 @@ func (payout *PayoutEndpoint) AllSatellitesSummary(ctx context.Context, req *mul var totalPaid, totalHeld int64 satelliteIDs, err := payout.db.GetPayingSatellitesIDs(ctx) if err != nil { - return &multinodepb.AllSatellitesSummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.SummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } for _, id := range satelliteIDs { paid, held, err := payout.db.GetSatelliteSummary(ctx, id) if err != nil { - return &multinodepb.AllSatellitesSummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.SummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } totalHeld += held totalPaid += paid } - return &multinodepb.AllSatellitesSummaryResponse{PayoutInfo: &multinodepb.PayoutInfo{Paid: totalPaid, Held: totalHeld}}, nil + return &multinodepb.SummaryResponse{PayoutInfo: &multinodepb.PayoutInfo{Paid: totalPaid, Held: totalHeld}}, nil } -// AllSatellitesPeriodSummary returns all satellites period payout summary. -func (payout *PayoutEndpoint) AllSatellitesPeriodSummary(ctx context.Context, req *multinodepb.AllSatellitesPeriodSummaryRequest) (_ *multinodepb.AllSatellitesPeriodSummaryResponse, err error) { +// SummaryPeriod returns all satellites period payout summary. +func (payout *PayoutEndpoint) SummaryPeriod(ctx context.Context, req *multinodepb.SummaryPeriodRequest) (_ *multinodepb.SummaryPeriodResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -159,24 +159,24 @@ func (payout *PayoutEndpoint) AllSatellitesPeriodSummary(ctx context.Context, re var totalPaid, totalHeld int64 satelliteIDs, err := payout.db.GetPayingSatellitesIDs(ctx) if err != nil { - return &multinodepb.AllSatellitesPeriodSummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.SummaryPeriodResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } for _, id := range satelliteIDs { paid, held, err := payout.db.GetSatellitePeriodSummary(ctx, id, req.Period) if err != nil { - return &multinodepb.AllSatellitesPeriodSummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.SummaryPeriodResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } totalHeld += held totalPaid += paid } - return &multinodepb.AllSatellitesPeriodSummaryResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil + return &multinodepb.SummaryPeriodResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil } -// SatelliteSummary returns satellite all time payout summary. -func (payout *PayoutEndpoint) SatelliteSummary(ctx context.Context, req *multinodepb.SatelliteSummaryRequest) (_ *multinodepb.SatelliteSummaryResponse, err error) { +// SummarySatellite returns satellite all time payout summary. +func (payout *PayoutEndpoint) SummarySatellite(ctx context.Context, req *multinodepb.SummarySatelliteRequest) (_ *multinodepb.SummarySatelliteResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -187,14 +187,14 @@ func (payout *PayoutEndpoint) SatelliteSummary(ctx context.Context, req *multino totalPaid, totalHeld, err = payout.db.GetSatelliteSummary(ctx, req.SatelliteId) if err != nil { - return &multinodepb.SatelliteSummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.SummarySatelliteResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } - return &multinodepb.SatelliteSummaryResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil + return &multinodepb.SummarySatelliteResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil } -// SatellitePeriodSummary returns satellite period payout summary. -func (payout *PayoutEndpoint) SatellitePeriodSummary(ctx context.Context, req *multinodepb.SatellitePeriodSummaryRequest) (_ *multinodepb.SatellitePeriodSummaryResponse, err error) { +// SummarySatellitePeriod returns satellite period payout summary. +func (payout *PayoutEndpoint) SummarySatellitePeriod(ctx context.Context, req *multinodepb.SummarySatellitePeriodRequest) (_ *multinodepb.SummarySatellitePeriodResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -205,10 +205,10 @@ func (payout *PayoutEndpoint) SatellitePeriodSummary(ctx context.Context, req *m totalPaid, totalHeld, err = payout.db.GetSatellitePeriodSummary(ctx, req.SatelliteId, req.Period) if err != nil { - return &multinodepb.SatellitePeriodSummaryResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) + return &multinodepb.SummarySatellitePeriodResponse{}, rpcstatus.Wrap(rpcstatus.Internal, err) } - return &multinodepb.SatellitePeriodSummaryResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil + return &multinodepb.SummarySatellitePeriodResponse{PayoutInfo: &multinodepb.PayoutInfo{Held: totalHeld, Paid: totalPaid}}, nil } // Undistributed returns total undistributed amount. @@ -227,8 +227,8 @@ func (payout *PayoutEndpoint) Undistributed(ctx context.Context, req *multinodep return &multinodepb.UndistributedResponse{Total: earned}, nil } -// SatellitePaystub returns summed amounts of all values from paystubs from all satellites. -func (payout *PayoutEndpoint) SatellitePaystub(ctx context.Context, req *multinodepb.SatellitePaystubRequest) (_ *multinodepb.SatellitePaystubResponse, err error) { +// PaystubSatellite returns summed amounts of all values from paystubs from all satellites. +func (payout *PayoutEndpoint) PaystubSatellite(ctx context.Context, req *multinodepb.PaystubSatelliteRequest) (_ *multinodepb.PaystubSatelliteResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -240,7 +240,7 @@ func (payout *PayoutEndpoint) SatellitePaystub(ctx context.Context, req *multino return nil, rpcstatus.Wrap(rpcstatus.Internal, err) } - return &multinodepb.SatellitePaystubResponse{Paystub: &multinodepb.Paystub{ + return &multinodepb.PaystubSatelliteResponse{Paystub: &multinodepb.Paystub{ UsageAtRest: paystub.UsageAtRest, UsageGet: paystub.UsageGet, UsageGetRepair: paystub.UsageGetRepair, @@ -283,8 +283,8 @@ func (payout *PayoutEndpoint) Paystub(ctx context.Context, req *multinodepb.Pays }}, nil } -// PeriodPaystub returns summed amounts of all values from paystubs from all satellites for specific period. -func (payout *PayoutEndpoint) PeriodPaystub(ctx context.Context, req *multinodepb.PeriodPaystubRequest) (_ *multinodepb.PeriodPaystubResponse, err error) { +// PaystubPeriod returns summed amounts of all values from paystubs from all satellites for specific period. +func (payout *PayoutEndpoint) PaystubPeriod(ctx context.Context, req *multinodepb.PaystubPeriodRequest) (_ *multinodepb.PaystubPeriodResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -296,7 +296,7 @@ func (payout *PayoutEndpoint) PeriodPaystub(ctx context.Context, req *multinodep return nil, rpcstatus.Wrap(rpcstatus.Internal, err) } - return &multinodepb.PeriodPaystubResponse{Paystub: &multinodepb.Paystub{ + return &multinodepb.PaystubPeriodResponse{Paystub: &multinodepb.Paystub{ UsageAtRest: paystub.UsageAtRest, UsageGet: paystub.UsageGet, UsageGetRepair: paystub.UsageGetRepair, @@ -311,8 +311,8 @@ func (payout *PayoutEndpoint) PeriodPaystub(ctx context.Context, req *multinodep }}, nil } -// SatellitePeriodPaystub returns summed amounts of all values from paystubs from all satellites for specific period. -func (payout *PayoutEndpoint) SatellitePeriodPaystub(ctx context.Context, req *multinodepb.SatellitePeriodPaystubRequest) (_ *multinodepb.SatellitePeriodPaystubResponse, err error) { +// PaystubPeriodSatellite returns summed amounts of all values from paystubs from all satellites for specific period. +func (payout *PayoutEndpoint) PaystubPeriodSatellite(ctx context.Context, req *multinodepb.PaystubSatellitePeriodRequest) (_ *multinodepb.PaystubSatellitePeriodResponse, err error) { defer mon.Task()(&ctx)(&err) if err = authenticate(ctx, payout.apiKeys, req.GetHeader()); err != nil { @@ -324,7 +324,7 @@ func (payout *PayoutEndpoint) SatellitePeriodPaystub(ctx context.Context, req *m return nil, rpcstatus.Wrap(rpcstatus.Internal, err) } - return &multinodepb.SatellitePeriodPaystubResponse{Paystub: &multinodepb.Paystub{ + return &multinodepb.PaystubSatellitePeriodResponse{Paystub: &multinodepb.Paystub{ UsageAtRest: paystub.UsageAtRest, UsageGet: paystub.UsageGet, UsageGetRepair: paystub.UsageGetRepair, diff --git a/storagenode/multinode/payout_test.go b/storagenode/multinode/payout_test.go index 5e3dea502..df584a02e 100644 --- a/storagenode/multinode/payout_test.go +++ b/storagenode/multinode/payout_test.go @@ -97,7 +97,7 @@ func TestPayoutsEndpointSummary(t *testing.T) { key, err := service.Issue(ctx) require.NoError(t, err) - response, err := endpoint.AllSatellitesPeriodSummary(ctx, &multinodepb.AllSatellitesPeriodSummaryRequest{ + response, err := endpoint.SummaryPeriod(ctx, &multinodepb.SummaryPeriodRequest{ Header: &multinodepb.RequestHeader{ ApiKey: key.Secret[:], }, Period: "2020-10", @@ -106,7 +106,7 @@ func TestPayoutsEndpointSummary(t *testing.T) { require.Equal(t, response.PayoutInfo.Paid, amount) require.Equal(t, response.PayoutInfo.Held, amount) - response2, err := endpoint.AllSatellitesSummary(ctx, &multinodepb.AllSatellitesSummaryRequest{ + response2, err := endpoint.Summary(ctx, &multinodepb.SummaryRequest{ Header: &multinodepb.RequestHeader{ ApiKey: key.Secret[:], }, @@ -115,7 +115,7 @@ func TestPayoutsEndpointSummary(t *testing.T) { require.Equal(t, response2.PayoutInfo.Paid, amount+amount2) require.Equal(t, response2.PayoutInfo.Held, amount+amount2) - response3, err := endpoint.SatellitePeriodSummary(ctx, &multinodepb.SatellitePeriodSummaryRequest{ + response3, err := endpoint.SummarySatellitePeriod(ctx, &multinodepb.SummarySatellitePeriodRequest{ Header: &multinodepb.RequestHeader{ ApiKey: key.Secret[:], }, SatelliteId: id2, Period: "2020-11", @@ -124,7 +124,7 @@ func TestPayoutsEndpointSummary(t *testing.T) { require.Equal(t, response3.PayoutInfo.Paid, amount2) require.Equal(t, response3.PayoutInfo.Held, amount2) - response4, err := endpoint.SatelliteSummary(ctx, &multinodepb.SatelliteSummaryRequest{ + response4, err := endpoint.SummarySatellite(ctx, &multinodepb.SummarySatelliteRequest{ Header: &multinodepb.RequestHeader{ ApiKey: key.Secret[:], }, SatelliteId: id, @@ -199,7 +199,7 @@ func TestPayoutsEndpointEstimations(t *testing.T) { estimation, err := estimatedPayoutsService.GetAllSatellitesEstimatedPayout(ctx, time.Now()) require.NoError(t, err) - resp, err := endpoint.EstimatedPayoutTotal(ctx, &multinodepb.EstimatedPayoutTotalRequest{Header: &multinodepb.RequestHeader{ + resp, err := endpoint.EstimatedPayout(ctx, &multinodepb.EstimatedPayoutRequest{Header: &multinodepb.RequestHeader{ ApiKey: key.Secret[:], }}) require.NoError(t, err) diff --git a/storagenode/peer.go b/storagenode/peer.go index 4789d2720..e05268b6e 100644 --- a/storagenode/peer.go +++ b/storagenode/peer.go @@ -821,7 +821,7 @@ func New(log *zap.Logger, full *identity.FullIdentity, db DB, revocationDB exten if err = multinodepb.DRPCRegisterNode(peer.Server.DRPC(), peer.Multinode.Node); err != nil { return nil, errs.Combine(err, peer.Close()) } - if err = multinodepb.DRPCRegisterPayout(peer.Server.DRPC(), peer.Multinode.Payout); err != nil { + if err = multinodepb.DRPCRegisterPayouts(peer.Server.DRPC(), peer.Multinode.Payout); err != nil { return nil, errs.Combine(err, peer.Close()) } }