akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3360 from tyzbit/3357_start-time

Browse Source 
rpcserver: startTime defaults to the unix epoch
This commit is contained in:
Olaoluwa Osuntokun 2019-10-07 16:48:23 -07:00 committed by GitHub
commit 2a3538fec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/lncli/commands.go
View File

@ -16,6 +16,7 @@ import (
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
"time"
"github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire" "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) return fmt.Errorf("unable to decode start_time %v", err)
} }
args = args.Tail() args = args.Tail()
default:
now := time.Now()
startTime = uint64(now.Add(-time.Hour * 24).Unix())
} }
switch { switch {

9
rpcserver.go
View File

@ -4672,13 +4672,8 @@ func (r *rpcServer) ForwardingHistory(ctx context.Context,
numEvents uint32 numEvents uint32
) )
// If the start time wasn't specified, we'll default to 24 hours ago. // startTime defaults to the Unix epoch (0 unixtime, or midnight 01-01-1970).
if req.StartTime == 0 { startTime = time.Unix(int64(req.StartTime), 0)
now := time.Now()
startTime = now.Add(-time.Hour * 24)
} else {
startTime = time.Unix(int64(req.StartTime), 0)
}
// If the end time wasn't specified, assume a default end time of now. // If the end time wasn't specified, assume a default end time of now.
if req.EndTime == 0 { if req.EndTime == 0 {