LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Fix return types for handleGetNetworkHashPS.

Browse source
This commit is contained in:
Josh Rickmar 2015-02-28 21:40:13 -05:00
parent 2c80b44024
commit 5ac0f1247d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rpcserver.go
View file

@ -1816,6 +1816,10 @@ func handleGetNetTotals(s *rpcServer, cmd interface{}, closeChan <-chan struct{}
// handleGetNetworkHashPS implements the getnetworkhashps command. // handleGetNetworkHashPS implements the getnetworkhashps command.
func handleGetNetworkHashPS(s *rpcServer, cmd interface{}, closeChan <-chan struct{}) (interface{}, error) { func handleGetNetworkHashPS(s *rpcServer, cmd interface{}, closeChan <-chan struct{}) (interface{}, error) {
// Note: All valid error return paths should return an int64.
// Literal zeros are inferred as int, and won't coerce to int64
// because the return value is an interface{}.
c := cmd.(*btcjson.GetNetworkHashPSCmd) c := cmd.(*btcjson.GetNetworkHashPSCmd)
_, newestHeight, err := s.server.db.NewestSha() _, newestHeight, err := s.server.db.NewestSha()
@ -1833,7 +1837,7 @@ func handleGetNetworkHashPS(s *rpcServer, cmd interface{}, closeChan <-chan stru
endHeight = int64(*c.Height) endHeight = int64(*c.Height)
} }
if endHeight > newestHeight || endHeight == 0 { if endHeight > newestHeight || endHeight == 0 {
return 0, nil return int64(0), nil
} }
if endHeight < 0 { if endHeight < 0 {
endHeight = newestHeight endHeight = newestHeight
@ -1896,7 +1900,7 @@ func handleGetNetworkHashPS(s *rpcServer, cmd interface{}, closeChan <-chan stru
// time difference. // time difference.
timeDiff := int64(maxTimestamp.Sub(minTimestamp) / time.Second) timeDiff := int64(maxTimestamp.Sub(minTimestamp) / time.Second)
if timeDiff == 0 { if timeDiff == 0 {
return 0, nil return int64(0), nil
} }
hashesPerSec := new(big.Int).Div(totalWork, big.NewInt(timeDiff)) hashesPerSec := new(big.Int).Div(totalWork, big.NewInt(timeDiff))