wallet/chainntfns.go

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

wallet/chainntfns_test.go

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

wallet/wallet.go

@@ -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 birthdayStamp == nil {
-
-		// To be on the safe side, scan 2 days past of the actual
-		// timestamp.
-		bday := w.Manager.Birthday().Add(48 * time.Hour)
-		birthdayStamp, err = locateBirthdayBlock(chainClient, bday)
+		var err error
+		birthdayStamp, err = locateBirthdayBlock(
+			chainClient, w.Manager.Birthday(),
+		)
 		if err != nil {
 			return fmt.Errorf("unable to locate birthday block: %v",
 				err)