LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Fix off-by-one making rescanfinished notification.

Browse source 
Fixes #150.

ok @davecgh
This commit is contained in:
Josh Rickmar 2014-07-12 09:29:43 -05:00
parent be7923a4ed
commit e495dcbc2f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpcwebsocket.go
View file

@ -1678,6 +1678,7 @@ func handleRescan(wsc *wsClient, icmd btcjson.Cmd) (interface{}, *btcjson.Error)
minBlock := int64(cmd.BeginBlock) minBlock := int64(cmd.BeginBlock)
maxBlock := int64(cmd.EndBlock) maxBlock := int64(cmd.EndBlock)
lastBlock := int64(-1) // -1 indicates no blocks scanned
// A ticker is created to wait at least 10 seconds before notifying the // A ticker is created to wait at least 10 seconds before notifying the
// websocket client of the current progress completed by the rescan. // websocket client of the current progress completed by the rescan.
@ -1741,6 +1742,7 @@ func handleRescan(wsc *wsClient, icmd btcjson.Cmd) (interface{}, *btcjson.Error)
} }
minBlock += int64(len(hashList)) minBlock += int64(len(hashList))
lastBlock = minBlock - 1
} }
// Notify websocket client of the finished rescan. Due to how btcd // Notify websocket client of the finished rescan. Due to how btcd
@ -1750,7 +1752,7 @@ func handleRescan(wsc *wsClient, icmd btcjson.Cmd) (interface{}, *btcjson.Error)
// received before the rescan RPC returns. Therefore, another method // received before the rescan RPC returns. Therefore, another method
// is needed to safely inform clients that all rescan notifiations have // is needed to safely inform clients that all rescan notifiations have
// been sent. // been sent.
n := btcws.NewRescanFinishedNtfn(int32(minBlock)) n := btcws.NewRescanFinishedNtfn(int32(lastBlock))
if mn, err := n.MarshalJSON(); err != nil { if mn, err := n.MarshalJSON(); err != nil {
rpcsLog.Errorf("Failed to marshal rescan finished "+ rpcsLog.Errorf("Failed to marshal rescan finished "+
"notification: %v", err) "notification: %v", err)