mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-24 08:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

proto: rename timing params to synchrony params (#7554)

Browse Source
This commit is contained in:
William Banfield
2022-01-12 12:02:01 -05:00
committed by GitHub
parent 2617a5cf33
commit d9792cdb21
11 changed files with 123 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/consensus/pbts_test.go
+7 -7
View File
@@ -66,7 +66,7 @@ type pbtsTestHarness struct {
type pbtsTestConfiguration struct {
// The timestamp consensus parameters to be used by the state machine under test.
timingParams types.TimingParams
synchronyParams types.SynchronyParams
// The setting to use for the TimeoutPropose configuration parameter.
timeoutPropose time.Duration
@@ -102,7 +102,7 @@ func newPBTSTestHarness(ctx context.Context, t *testing.T, tc pbtsTestConfigurat
}
cfg.Consensus.TimeoutPropose = tc.timeoutPropose
consensusParams := types.DefaultConsensusParams()
consensusParams.Timing = tc.timingParams
consensusParams.Synchrony = tc.synchronyParams
state, privVals := makeGenesisState(cfg, genesisStateArgs{
Params: consensusParams,
@@ -333,7 +333,7 @@ func TestProposerWaitsForGenesisTime(t *testing.T) {
// create a genesis time far (enough) in the future.
initialTime := time.Now().Add(800 * time.Millisecond)
cfg := pbtsTestConfiguration{
timingParams: types.TimingParams{
synchronyParams: types.SynchronyParams{
Precision: 10 * time.Millisecond,
MessageDelay: 10 * time.Millisecond,
},
@@ -361,7 +361,7 @@ func TestProposerWaitsForPreviousBlock(t *testing.T) {
defer cancel()
initialTime := time.Now().Add(time.Millisecond * 50)
cfg := pbtsTestConfiguration{
timingParams: types.TimingParams{
synchronyParams: types.SynchronyParams{
Precision: 100 * time.Millisecond,
MessageDelay: 500 * time.Millisecond,
},
@@ -430,7 +430,7 @@ func TestTimelyProposal(t *testing.T) {
initialTime := time.Now()
cfg := pbtsTestConfiguration{
timingParams: types.TimingParams{
synchronyParams: types.SynchronyParams{
Precision: 10 * time.Millisecond,
MessageDelay: 140 * time.Millisecond,
},
@@ -453,7 +453,7 @@ func TestTooFarInThePastProposal(t *testing.T) {
// localtime > proposedBlockTime + MsgDelay + Precision
cfg := pbtsTestConfiguration{
timingParams: types.TimingParams{
synchronyParams: types.SynchronyParams{
Precision: 1 * time.Millisecond,
MessageDelay: 10 * time.Millisecond,
},
@@ -478,7 +478,7 @@ func TestTooFarInTheFutureProposal(t *testing.T) {
// localtime < proposedBlockTime - Precision
cfg := pbtsTestConfiguration{
timingParams: types.TimingParams{
synchronyParams: types.SynchronyParams{
Precision: 1 * time.Millisecond,
MessageDelay: 10 * time.Millisecond,
},
internal/consensus/state.go
+6 -6
View File
@@ -1314,12 +1314,12 @@ func (cs *State) enterPrevote(height int64, round int32) {
}
func (cs *State) proposalIsTimely() bool {
tp := types.TimingParams{
Precision: cs.state.ConsensusParams.Timing.Precision,
MessageDelay: cs.state.ConsensusParams.Timing.MessageDelay,
sp := types.SynchronyParams{
Precision: cs.state.ConsensusParams.Synchrony.Precision,
MessageDelay: cs.state.ConsensusParams.Synchrony.MessageDelay,
}
return cs.Proposal.IsTimely(cs.ProposalReceiveTime, tp, cs.state.InitialHeight)
return cs.Proposal.IsTimely(cs.ProposalReceiveTime, sp, cs.state.InitialHeight)
}
func (cs *State) defaultDoPrevote(height int64, round int32) {
@@ -1351,9 +1351,9 @@ func (cs *State) defaultDoPrevote(height int64, round int32) {
"received",
tmtime.Canonical(cs.ProposalReceiveTime).Format(time.RFC3339Nano),
"msg_delay",
cs.state.ConsensusParams.Timing.MessageDelay,
cs.state.ConsensusParams.Synchrony.MessageDelay,
"precision",
cs.state.ConsensusParams.Timing.Precision)
cs.state.ConsensusParams.Synchrony.Precision)
cs.signAddVote(tmproto.PrevoteType, nil, types.PartSetHeader{})
return
}