Merge commit 'b03dced9a' into wb/proposer-based-timestamps

This commit is contained in:
Anca Zamfir
2021-12-18 02:27:36 +01:00
+8 -6
View File
@@ -328,15 +328,16 @@ func (hr heightResult) isComplete() bool {
// until after the genesis time has passed. The test sets the genesis time in the // until after the genesis time has passed. The test sets the genesis time in the
// future and then ensures that the observed validator waits to propose a block. // future and then ensures that the observed validator waits to propose a block.
func TestProposerWaitsForGenesisTime(t *testing.T) { func TestProposerWaitsForGenesisTime(t *testing.T) {
t.Skip()
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
// create a genesis time far (enough) in the future. // create a genesis time far (enough) in the future.
initialTime := time.Now().Add(800 * time.Millisecond) initialTime := time.Now().Add(800 * time.Millisecond)
cfg := pbtsTestConfiguration{ cfg := pbtsTestConfiguration{
timestampParams: types.TimestampParams{ timingParams: types.TimingParams{
Precision: 10 * time.Millisecond, Precision: 10 * time.Millisecond,
MsgDelay: 10 * time.Millisecond, MessageDelay: 10 * time.Millisecond,
}, },
timeoutPropose: 10 * time.Millisecond, timeoutPropose: 10 * time.Millisecond,
genesisTime: initialTime, genesisTime: initialTime,
@@ -358,13 +359,14 @@ func TestProposerWaitsForGenesisTime(t *testing.T) {
// and then verifies that the observed validator waits until after the block time // and then verifies that the observed validator waits until after the block time
// of height 4 to propose a block at height 5. // of height 4 to propose a block at height 5.
func TestProposerWaitsForPreviousBlock(t *testing.T) { func TestProposerWaitsForPreviousBlock(t *testing.T) {
t.Skip()
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
initialTime := time.Now().Add(time.Millisecond * 50) initialTime := time.Now().Add(time.Millisecond * 50)
cfg := pbtsTestConfiguration{ cfg := pbtsTestConfiguration{
timestampParams: types.TimestampParams{ timingParams: types.TimingParams{
Precision: 100 * time.Millisecond, Precision: 100 * time.Millisecond,
MsgDelay: 500 * time.Millisecond, MessageDelay: 500 * time.Millisecond,
}, },
timeoutPropose: 50 * time.Millisecond, timeoutPropose: 50 * time.Millisecond,
genesisTime: initialTime, genesisTime: initialTime,