Fixed some logging

plugin/evm/statesync/downloader.go

@@ -89,7 +89,7 @@ func (d *Downloader) Pivot() *types.Block {
 
 // Opens bufferLock to allow block requests to go through after finalizing the sync
 func (d *Downloader) Close() {
-	d.bufferLock.TryLock()
+	d.bufferLock.TryLock() // this should be a no-op
 	d.flushQueue(true)
 	d.bufferLock.Unlock()
 }
@@ -172,14 +172,12 @@ func (d *Downloader) SnapSync() error {
 		// If stateSync is ended, clear queue and return
 		// If err, just return so we can see it
 		case <-sync.done:
-			if sync.err != nil {
-				return sync.err
-			}
-			d.bufferLock.Lock() // unlocked by syncer client once we can normally process blocks
-			return nil
+			d.bufferLock.Lock() // unlocked in Close()
+			return sync.err
 		case newPivot := <-d.newPivot:
 			// If a new pivot block is found, cancel the current state sync and
 			// start a new one.
+			log.Debug("Pivot block updated to", "hash", d.pivotBlock.Root(), d.pivotBlock.NumberU64())
 			sync.Cancel()
 			sync = d.syncState(newPivot.Root())
 		}

plugin/evm/syncervm_client.go

@@ -274,7 +274,7 @@ func (client *stateSyncerClient) acceptSyncSummary(proposedSummary message.SyncS
 			return block.StateSyncSkipped, err
 		}
 
-		log.Info("Set LastAcceptedBlock as first pivot", "height", evmBlock.ID(), evmBlock.Height(), "timestamp", evmBlock.Timestamp())
+		log.Info("Set LastAcceptedBlock as first pivot", "id", evmBlock.ID(), "height", evmBlock.Height(), "timestamp", evmBlock.Timestamp())
 	}
 	go func() {
 		defer client.wg.Done()
@@ -287,6 +287,7 @@ func (client *stateSyncerClient) acceptSyncSummary(proposedSummary message.SyncS
 			client.stateSyncErr = err
 		} else {
 			if client.useUpstream {
+				// finish sync on final pivot, Close() will clear queue as if bootstrapping from static sync
 				client.stateSyncErr = client.finishSync(client.dl.Pivot().Hash())
 			} else {
 				client.stateSyncErr = client.finishSync(client.syncSummary.BlockHash)