Merge pull request #3360 from tyzbit/3357_start-time
rpcserver: startTime defaults to the unix epoch
This commit is contained in:
commit
2a3538fec8
@ -16,6 +16,7 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/btcsuite/btcd/chaincfg/chainhash"
|
||||
"github.com/btcsuite/btcd/wire"
|
||||
@ -3582,6 +3583,9 @@ func forwardingHistory(ctx *cli.Context) error {
|
||||
return fmt.Errorf("unable to decode start_time %v", err)
|
||||
}
|
||||
args = args.Tail()
|
||||
default:
|
||||
now := time.Now()
|
||||
startTime = uint64(now.Add(-time.Hour * 24).Unix())
|
||||
}
|
||||
|
||||
switch {
|
||||
|
@ -4672,13 +4672,8 @@ func (r *rpcServer) ForwardingHistory(ctx context.Context,
|
||||
numEvents uint32
|
||||
)
|
||||
|
||||
// If the start time wasn't specified, we'll default to 24 hours ago.
|
||||
if req.StartTime == 0 {
|
||||
now := time.Now()
|
||||
startTime = now.Add(-time.Hour * 24)
|
||||
} else {
|
||||
startTime = time.Unix(int64(req.StartTime), 0)
|
||||
}
|
||||
// startTime defaults to the Unix epoch (0 unixtime, or midnight 01-01-1970).
|
||||
startTime = time.Unix(int64(req.StartTime), 0)
|
||||
|
||||
// If the end time wasn't specified, assume a default end time of now.
|
||||
if req.EndTime == 0 {
|
||||
|
Loading…
Reference in New Issue
Block a user