zecfoundation
/
lightwalletd
mirror of https://github.com/ZcashFoundation/lightwalletd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't sleep 1s for reorg, wait 2s for new blocks

This commit is contained in:
Larry Ruane 2020-05-09 15:03:00 -06:00 committed by Larry Ruane
parent d7e1005523
commit 38d71a8f1d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/common.go
View File

@ -178,9 +178,10 @@ func BlockIngestor(c *BlockCache, rep int) {
// Wait a bit then retry the same height. // Wait a bit then retry the same height.
c.Sync() c.Sync()
if lastHeightLogged+1 != height { if lastHeightLogged+1 != height {
Log.Info("Ingestor waiting for block: ", height) Log.Info("Ingestor LHL: ", lastHeightLogged, " waiting for block: ", height)
lastHeightLogged = height - 1
} }
Sleep(10 * time.Second) Sleep(2 * time.Second)
wait = false wait = false
continue continue
} }
@ -212,7 +213,6 @@ func BlockIngestor(c *BlockCache, rep int) {
} }
// Try backing up // Try backing up
c.Reorg(height - 1) c.Reorg(height - 1)
Sleep(1 * time.Second)
continue continue
} }
// We have a valid block to add. // We have a valid block to add.

16
common/common_test.go
View File

@ -179,7 +179,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
// this should cause one 10s sleep (then retry). // this should cause one 10s sleep (then retry).
return nil, errors.New("-8: Block height out of range") return nil, errors.New("-8: Block height out of range")
case 4: case 4:
if sleepCount != 1 || sleepDuration != 10*time.Second { if sleepCount != 1 || sleepDuration != 2*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380642" { if height != "380642" {
@ -189,7 +189,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
// wait then a check for reorg to shorter chain (back up one). // wait then a check for reorg to shorter chain (back up one).
return nil, errors.New("-8: Block height out of range") return nil, errors.New("-8: Block height out of range")
case 5: case 5:
if sleepCount != 2 || sleepDuration != 11*time.Second { if sleepCount != 1 || sleepDuration != 2*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
// Back up to 41. // Back up to 41.
@ -200,7 +200,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
// ingestor will immediately re-request the next block (42). // ingestor will immediately re-request the next block (42).
return blocks[1], nil return blocks[1], nil
case 6: case 6:
if sleepCount != 2 || sleepDuration != 11*time.Second { if sleepCount != 1 || sleepDuration != 2*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380642" { if height != "380642" {
@ -209,7 +209,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
// Block 42 has now finally appeared, it will immediately ask for 43. // Block 42 has now finally appeared, it will immediately ask for 43.
return blocks[2], nil return blocks[2], nil
case 7: case 7:
if sleepCount != 2 || sleepDuration != 11*time.Second { if sleepCount != 1 || sleepDuration != 2*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380643" { if height != "380643" {
@ -221,7 +221,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
return blocks[3], nil return blocks[3], nil
case 8: case 8:
blocks[3][9]-- // repair first byte of the prevhash blocks[3][9]-- // repair first byte of the prevhash
if sleepCount != 3 || sleepDuration != 12*time.Second { if sleepCount != 1 || sleepDuration != 2*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380642" { if height != "380642" {
@ -229,7 +229,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
} }
return blocks[2], nil return blocks[2], nil
case 9: case 9:
if sleepCount != 3 || sleepDuration != 12*time.Second { if sleepCount != 1 || sleepDuration != 2*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380643" { if height != "380643" {
@ -239,7 +239,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
// failure, should cause 10s sleep, retry // failure, should cause 10s sleep, retry
return nil, nil return nil, nil
case 10: case 10:
if sleepCount != 4 || sleepDuration != 22*time.Second { if sleepCount != 2 || sleepDuration != 12*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380643" { if height != "380643" {
@ -248,7 +248,7 @@ func getblockStub(method string, params []json.RawMessage) (json.RawMessage, err
// Back to sunny-day // Back to sunny-day
return blocks[3], nil return blocks[3], nil
case 11: case 11:
if sleepCount != 4 || sleepDuration != 22*time.Second { if sleepCount != 2 || sleepDuration != 12*time.Second {
testT.Error("unexpected sleeps", sleepCount, sleepDuration) testT.Error("unexpected sleeps", sleepCount, sleepDuration)
} }
if height != "380644" { if height != "380644" {