Merge with #8493
This commit is contained in:
Jasmina Malicevic
2022-05-11 13:05:45 +02:00
parent 8b68022d16
commit 3a476331f1
2 changed files with 5 additions and 3 deletions

View File

@@ -175,6 +175,7 @@ func (rts *reactorTestSuite) addMultipleNodes(
commitSigs := make([]types.CommitSig, len(privValArray))
votes := make([]types.Vote, len(privValArray))
for i, val := range privValArray {
vote, err := factory.MakeVote(
ctx,
val,
@@ -186,6 +187,7 @@ func (rts *reactorTestSuite) addMultipleNodes(
require.NoError(t, err)
votes[i] = *vote
commitSigs[i] = vote.CommitSig()
}
lastCommit = types.NewCommit(
votes[0].Height,
@@ -420,7 +422,7 @@ func TestReactor_NonGenesisSync(t *testing.T) {
genDoc := factory.GenesisDoc(cfg, time.Now(), valSet.Validators, factory.ConsensusParams())
maxBlockHeight := int64(101)
rts := setup(ctx, t, genDoc, privVals, []int64{maxBlockHeight, 50, 4, 0})
rts := setup(ctx, t, genDoc, privVals, []int64{maxBlockHeight, 2, 0}) //50, 4, 0})
require.Equal(t, maxBlockHeight, rts.reactors[rts.nodes[0]].store.Height())
rts.start(ctx, t)
@@ -442,7 +444,7 @@ func TestReactor_NonGenesisSync(t *testing.T) {
}
return matching
},
20*time.Second,
10*time.Second,
10*time.Millisecond,
"expected node to be partially synced",
)

View File

@@ -289,7 +289,7 @@ title: Methods
|-------------------------|---------------------------------------------|------------------------------------------------------------------------------------------------------------------|--------------|
| max_tx_bytes | int64 | Currently configured maximum size in bytes taken by the modified transactions. | 1 |
| txs | repeated bytes | Preliminary list of transactions that have been picked as part of the block to propose. | 2 |
| local_last_commit | [ExtendedCommitInfo](#extendedcommitinfo) | Info about the last commit, obtained locally from Tendermint's data structures. | 3 |
| local_last_commit | [Info](#extendedcommitinfo) | Info about the last commit, obtained locally from Tendermint's data structures. | 3 |
| byzantine_validators | repeated [Misbehavior](#misbehavior) | List of information about validators that acted incorrectly. | 4 |
| height | int64 | The height of the block that will be proposed. | 5 |
| time | [google.protobuf.Timestamp](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.Timestamp) | Timestamp of the block that that will be proposed. | 6 |