|
@ -288,7 +288,12 @@ func TestReactorWithTimeoutCommit(t *testing.T) { |
|
|
|
|
|
|
|
|
func waitForAndValidateBlock(t *testing.T, n int, activeVals map[string]struct{}, eventChans []chan interface{}, css []*ConsensusState, txs ...[]byte) { |
|
|
func waitForAndValidateBlock(t *testing.T, n int, activeVals map[string]struct{}, eventChans []chan interface{}, css []*ConsensusState, txs ...[]byte) { |
|
|
timeoutWaitGroup(t, n, func(wg *sync.WaitGroup, j int) { |
|
|
timeoutWaitGroup(t, n, func(wg *sync.WaitGroup, j int) { |
|
|
newBlockI := <-eventChans[j] |
|
|
|
|
|
|
|
|
defer wg.Done() |
|
|
|
|
|
|
|
|
|
|
|
newBlockI, ok := <-eventChans[j] |
|
|
|
|
|
if !ok { |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
newBlock := newBlockI.(types.TMEventData).Unwrap().(types.EventDataNewBlock).Block |
|
|
newBlock := newBlockI.(types.TMEventData).Unwrap().(types.EventDataNewBlock).Block |
|
|
t.Logf("Got block height=%v validator=%v", newBlock.Height, j) |
|
|
t.Logf("Got block height=%v validator=%v", newBlock.Height, j) |
|
|
err := validateBlock(newBlock, activeVals) |
|
|
err := validateBlock(newBlock, activeVals) |
|
@ -300,16 +305,20 @@ func waitForAndValidateBlock(t *testing.T, n int, activeVals map[string]struct{} |
|
|
t.Fatal(err) |
|
|
t.Fatal(err) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
wg.Done() |
|
|
|
|
|
}, css) |
|
|
}, css) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
func waitForBlockWithUpdatedValsAndValidateIt(t *testing.T, n int, updatedVals map[string]struct{}, eventChans []chan interface{}, css []*ConsensusState, txs ...[]byte) { |
|
|
func waitForBlockWithUpdatedValsAndValidateIt(t *testing.T, n int, updatedVals map[string]struct{}, eventChans []chan interface{}, css []*ConsensusState, txs ...[]byte) { |
|
|
timeoutWaitGroup(t, n, func(wg *sync.WaitGroup, j int) { |
|
|
timeoutWaitGroup(t, n, func(wg *sync.WaitGroup, j int) { |
|
|
|
|
|
defer wg.Done() |
|
|
|
|
|
|
|
|
var newBlock *types.Block |
|
|
var newBlock *types.Block |
|
|
LOOP: |
|
|
LOOP: |
|
|
for { |
|
|
for { |
|
|
newBlockI := <-eventChans[j] |
|
|
|
|
|
|
|
|
newBlockI, ok := <-eventChans[j] |
|
|
|
|
|
if !ok { |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
newBlock = newBlockI.(types.TMEventData).Unwrap().(types.EventDataNewBlock).Block |
|
|
newBlock = newBlockI.(types.TMEventData).Unwrap().(types.EventDataNewBlock).Block |
|
|
if newBlock.LastCommit.Size() == len(updatedVals) { |
|
|
if newBlock.LastCommit.Size() == len(updatedVals) { |
|
|
t.Logf("Block with new validators height=%v validator=%v", newBlock.Height, j) |
|
|
t.Logf("Block with new validators height=%v validator=%v", newBlock.Height, j) |
|
@ -323,8 +332,6 @@ func waitForBlockWithUpdatedValsAndValidateIt(t *testing.T, n int, updatedVals m |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
t.Fatal(err) |
|
|
t.Fatal(err) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
wg.Done() |
|
|
|
|
|
}, css) |
|
|
}, css) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|