JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/heldamount: fix dimension of usage_at_rest

Browse Source 
Change-Id: If1518ad41736912d15fb2c882c9e236c16f85a51
This commit is contained in:
Qweder93 2020-06-11 14:42:21 +03:00 committed by Nikolai Siedov
parent dc5502cb81
commit 0826c8d87f
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -39,7 +39,7 @@ require (
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 golang.org/x/time v0.0.0-20191024005414-555d28b269f0
golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect
storj.io/common v0.0.0-20200610120518-23c66ad8b617 storj.io/common v0.0.0-20200611114417-9a3d012fdb62
storj.io/drpc v0.0.12 storj.io/drpc v0.0.12
storj.io/monkit-jaeger v0.0.0-20200518165323-80778fc3f91b storj.io/monkit-jaeger v0.0.0-20200518165323-80778fc3f91b
storj.io/private v0.0.0-20200605221229-3236fe879ab3 storj.io/private v0.0.0-20200605221229-3236fe879ab3

2
go.sum
View File

@ -643,6 +643,8 @@ storj.io/common v0.0.0-20200608231620-70c5a4b319bb h1:J1mRpqv/WuVZKxjIQ1H4pK1bUZ
storj.io/common v0.0.0-20200608231620-70c5a4b319bb/go.mod h1:6S6Ub92/BB+ofU7hbyPcm96b4Q1ayyN0HLog+3u+wGc= storj.io/common v0.0.0-20200608231620-70c5a4b319bb/go.mod h1:6S6Ub92/BB+ofU7hbyPcm96b4Q1ayyN0HLog+3u+wGc=
storj.io/common v0.0.0-20200610120518-23c66ad8b617 h1:7Mo4JvcCvT8BQyGWTMmsI+BYRKCKrXEadXSfdVXifE8= storj.io/common v0.0.0-20200610120518-23c66ad8b617 h1:7Mo4JvcCvT8BQyGWTMmsI+BYRKCKrXEadXSfdVXifE8=
storj.io/common v0.0.0-20200610120518-23c66ad8b617/go.mod h1:6S6Ub92/BB+ofU7hbyPcm96b4Q1ayyN0HLog+3u+wGc= storj.io/common v0.0.0-20200610120518-23c66ad8b617/go.mod h1:6S6Ub92/BB+ofU7hbyPcm96b4Q1ayyN0HLog+3u+wGc=
storj.io/common v0.0.0-20200611114417-9a3d012fdb62 h1:y8vGNQ0HjtD79G8MfCwbs6hct40tSBoDaOnsxWOZpU4=
storj.io/common v0.0.0-20200611114417-9a3d012fdb62/go.mod h1:6S6Ub92/BB+ofU7hbyPcm96b4Q1ayyN0HLog+3u+wGc=
storj.io/drpc v0.0.11 h1:6vLxfpSbwCLtqzAoXzXx/SxBqBtbzbmquXPqfcWKqfw= storj.io/drpc v0.0.11 h1:6vLxfpSbwCLtqzAoXzXx/SxBqBtbzbmquXPqfcWKqfw=
storj.io/drpc v0.0.11 h1:6vLxfpSbwCLtqzAoXzXx/SxBqBtbzbmquXPqfcWKqfw= storj.io/drpc v0.0.11 h1:6vLxfpSbwCLtqzAoXzXx/SxBqBtbzbmquXPqfcWKqfw=
storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw= storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw=

4
satellite/heldamount/endpoint.go
View File

@ -76,7 +76,7 @@ func (e *Endpoint) GetPayStub(ctx context.Context, req *pb.GetHeldAmountRequest)
NodeId: stub.NodeID, NodeId: stub.NodeID,
CreatedAt: stub.Created, CreatedAt: stub.Created,
Codes: stub.Codes, Codes: stub.Codes,
UsageAtRest: float32(stub.UsageAtRest), UsageAtRest: stub.UsageAtRest,
UsageGet: stub.UsageGet, UsageGet: stub.UsageGet,
UsagePut: stub.UsagePut, UsagePut: stub.UsagePut,
UsageGetRepair: stub.UsageGetRepair, UsageGetRepair: stub.UsageGetRepair,
@ -138,7 +138,7 @@ func (e *Endpoint) GetAllPaystubs(ctx context.Context, req *pb.GetAllPaystubsReq
NodeId: stubs[i].NodeID, NodeId: stubs[i].NodeID,
CreatedAt: stubs[i].Created, CreatedAt: stubs[i].Created,
Codes: stubs[i].Codes, Codes: stubs[i].Codes,
UsageAtRest: float32(stubs[i].UsageAtRest), UsageAtRest: stubs[i].UsageAtRest,
UsageGet: stubs[i].UsageGet, UsageGet: stubs[i].UsageGet,
UsagePut: stubs[i].UsagePut, UsagePut: stubs[i].UsagePut,
UsageGetRepair: stubs[i].UsageGetRepair, UsageGetRepair: stubs[i].UsageGetRepair,

2
satellite/heldamount/heldamount.go
View File

@ -61,7 +61,7 @@ type Service struct {
db DB db DB
} }
// NewService returns a new Service // NewService returns a new Service.
func NewService(log *zap.Logger, db DB) *Service { func NewService(log *zap.Logger, db DB) *Service {
return &Service{ return &Service{
log: log, log: log,

4
storagenode/heldamount/service.go
View File

@ -100,7 +100,7 @@ func (service *Service) GetPaystubStats(ctx context.Context, satelliteID storj.N
SatelliteID: satelliteID, SatelliteID: satelliteID,
Created: resp.CreatedAt, Created: resp.CreatedAt,
Codes: resp.Codes, Codes: resp.Codes,
UsageAtRest: float64(resp.UsageAtRest), UsageAtRest: resp.UsageAtRest,
UsageGet: resp.UsageGet, UsageGet: resp.UsageGet,
UsagePut: resp.UsagePut, UsagePut: resp.UsagePut,
UsageGetRepair: resp.CompGetRepair, UsageGetRepair: resp.CompGetRepair,
@ -143,7 +143,7 @@ func (service *Service) GetAllPaystubs(ctx context.Context, satelliteID storj.No
SatelliteID: satelliteID, SatelliteID: satelliteID,
Created: resp.Paystub[i].CreatedAt, Created: resp.Paystub[i].CreatedAt,
Codes: resp.Paystub[i].Codes, Codes: resp.Paystub[i].Codes,
UsageAtRest: float64(resp.Paystub[i].UsageAtRest), UsageAtRest: resp.Paystub[i].UsageAtRest,
UsageGet: resp.Paystub[i].UsageGet, UsageGet: resp.Paystub[i].UsageGet,
UsagePut: resp.Paystub[i].UsagePut, UsagePut: resp.Paystub[i].UsagePut,
UsageGetRepair: resp.Paystub[i].CompGetRepair, UsageGetRepair: resp.Paystub[i].CompGetRepair,