Skip to content

Commit 4d75ef5

Browse files
committed
test renaming/clarification
1 parent a0f97cf commit 4d75ef5

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

agreement/asyncVoteVerifier_test.go

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ func generateTestVotes(onlyBadSigs bool, errChan chan<- error, count, eqCount in
234234

235235
nextErrType := 0
236236
for c := 0; c < count; c++ {
237-
errType := 99
237+
errType := validVote
238238
if rand.Float32() < errProb {
239239
if onlyBadSigs {
240240
errType = 0
241241
} else {
242242
errType = nextErrType
243-
nextErrType = (nextErrType + 1) % (vg.voteOptions() - 1)
243+
nextErrType = (nextErrType + 1) % (vg.invlideVoteOptions() - 1)
244244
}
245245
}
246246
v, err := vg.getTestVote(errType)
@@ -254,13 +254,13 @@ func generateTestVotes(onlyBadSigs bool, errChan chan<- error, count, eqCount in
254254
nextErrType = 0
255255
vg.counter = 0
256256
for c := 0; c < eqCount; c++ {
257-
errType := 99
257+
errType := validVote
258258
if rand.Float32() < errProb {
259259
if onlyBadSigs {
260260
errType = 0
261261
} else {
262262
errType = nextErrType
263-
nextErrType = (nextErrType + 1) % (vg.voteEqOptions() - 1)
263+
nextErrType = (nextErrType + 1) % (vg.invalidEqVoteOptions() - 1)
264264
}
265265
}
266266
v, err := vg.getTestEqVote(errType)
@@ -303,7 +303,10 @@ func makeTestVoteGenerator() testVoteGenerator {
303303
return tg
304304
}
305305

306-
const notSelected = 8
306+
const (
307+
notSelected = 8
308+
validVote = 10
309+
)
307310

308311
func (vg *testVoteGenerator) getTestVote(errType int) (v *unVoteTest, err error) {
309312
addrSelected := false
@@ -383,13 +386,17 @@ func (vg *testVoteGenerator) getTestVote(errType int) (v *unVoteTest, err error)
383386
case notSelected:
384387
v = &unVoteTest{uv: &uv, err: fmt.Errorf("address not selected"), id: c}
385388

386-
default:
389+
case validVote:
387390
v = &unVoteTest{uv: &uv, err: nil, id: c}
391+
392+
default:
393+
return v, fmt.Errorf("unrecognized option")
388394
}
389395
return v, nil
390396
}
391397

392-
func (vg *testVoteGenerator) voteOptions() int {
398+
// invlideVoteOptions returns the number of invalide vote options produced
399+
func (vg *testVoteGenerator) invlideVoteOptions() int {
393400
return 9
394401
}
395402

@@ -512,13 +519,16 @@ func (vg *testVoteGenerator) getTestEqVote(errType int) (v *unEqVoteTest, err er
512519
badSender.Sender = basics.Address{}
513520
v = &unEqVoteTest{uev: &badSender, err: fmt.Errorf("error bad sender"), id: c}
514521

515-
default:
522+
case validVote:
516523
v = &unEqVoteTest{uev: &ev, err: nil, id: c}
517524

525+
default:
526+
return v, fmt.Errorf("unrecognized option")
518527
}
519528
return v, nil
520529
}
521530

522-
func (vg *testVoteGenerator) voteEqOptions() int {
531+
// invalidEqVoteOptions returns the number of invalide vote options produced
532+
func (vg *testVoteGenerator) invalidEqVoteOptions() int {
523533
return 10
524534
}

0 commit comments

Comments
 (0)