cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

make OptimalSelection3 test pass

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
vyzo 2020-08-13 13:04:36 +03:00 committed by Jakub Sztandera
parent 1aa8b6cab2
commit f3eec33bec
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
chain/messagepool/selection_test.go
View File

@ -824,8 +824,8 @@ func TestOptimalMessageSelection3(t *testing.T) {
nMessages := int(build.BlockGasLimit/gasLimit) + 1 nMessages := int(build.BlockGasLimit/gasLimit) + 1
for i := 0; i < nMessages; i++ { for i := 0; i < nMessages; i++ {
for j := 0; j < nActors; j++ { for j := 0; j < nActors; j++ {
bias := (nActors-j)*nMessages + (nMessages+2-i)/(3*nActors) + i%3 premium := 500000 + 20000*(nActors-j) + (nMessages+2-i)/(3*nActors) + i%3
m := makeTestMessage(wallets[j], actors[j], actors[j%nActors], uint64(i), gasLimit, uint64(1+bias)) m := makeTestMessage(wallets[j], actors[j], actors[j%nActors], uint64(i), gasLimit, uint64(premium))
mustAdd(t, mp, m) mustAdd(t, mp, m)
} }
} }
@ -840,24 +840,27 @@ func TestOptimalMessageSelection3(t *testing.T) {
t.Fatalf("expected %d messages, but got %d", expectedMsgs, len(msgs)) t.Fatalf("expected %d messages, but got %d", expectedMsgs, len(msgs))
} }
nextNonce := uint64(0) whoIs := func(a address.Address) int {
a := actors[len(actors)/2-1] for i, aa := range actors {
for _, m := range msgs { if a == aa {
if m.Message.From != a { return i
who := 0
for i, a := range actors {
if a == m.Message.From {
who = i
break
}
} }
t.Fatalf("expected message from last actor, but got from %d instead", who) }
return -1
}
nonces := make([]uint64, nActors)
for _, m := range msgs {
who := whoIs(m.Message.From)
if who < 3 {
t.Fatalf("got message from %dth actor", who)
} }
nextNonce := nonces[who]
if m.Message.Nonce != nextNonce { if m.Message.Nonce != nextNonce {
t.Fatalf("expected nonce %d but got %d", nextNonce, m.Message.Nonce) t.Fatalf("expected nonce %d but got %d", nextNonce, m.Message.Nonce)
} }
nextNonce++ nonces[who]++
} }
} }