Update birthday related code #27

Merged
roylee17 merged 2 commits from roylee/update-birthday-related-code into master 2022-09-13 19:59:26 +02:00
3 changed files with 6 additions and 9 deletions

View file

@ -480,9 +480,7 @@ func birthdaySanityCheck(chainConn chainConn,
// Otherwise, we'll attempt to locate a better one now that we have // Otherwise, we'll attempt to locate a better one now that we have
// access to the chain. // access to the chain.
// To be on the safe side, scan 2 days past of the actual timestamp. newBirthdayBlock, err := locateBirthdayBlock(chainConn, birthdayTimestamp)
bday := birthdayTimestamp.Add(48 * time.Hour)
newBirthdayBlock, err := locateBirthdayBlock(chainConn, bday)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View file

@ -16,7 +16,7 @@ import (
const ( const (
// defaultBlockInterval is the default time interval between any two // defaultBlockInterval is the default time interval between any two
// blocks in a mocked chain. // blocks in a mocked chain.
defaultBlockInterval = 10 * time.Minute defaultBlockInterval = 150 * time.Second
) )
var ( var (

View file

@ -371,11 +371,10 @@ func (w *Wallet) syncWithChain(birthdayStamp *waddrmgr.BlockStamp) error {
// If we've yet to find our birthday block, we'll do so now. // If we've yet to find our birthday block, we'll do so now.
if birthdayStamp == nil { if birthdayStamp == nil {
var err error
// To be on the safe side, scan 2 days past of the actual birthdayStamp, err = locateBirthdayBlock(
// timestamp. chainClient, w.Manager.Birthday(),
bday := w.Manager.Birthday().Add(48 * time.Hour) )
birthdayStamp, err = locateBirthdayBlock(chainClient, bday)
if err != nil { if err != nil {
return fmt.Errorf("unable to locate birthday block: %v", return fmt.Errorf("unable to locate birthday block: %v",
err) err)