Merge branch 'course' into lorettax

This commit is contained in:
李佳 2021-05-14 11:09:24 +08:00 committed by GitHub
commit 42603af3c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -502,13 +502,11 @@ func TestOldMessages2AB(t *testing.T) {
tt.send(pb.Message{From: 1, To: 1, MsgType: pb.MessageType_MsgPropose, Entries: []*pb.Entry{{Data: []byte("somedata")}}}) tt.send(pb.Message{From: 1, To: 1, MsgType: pb.MessageType_MsgPropose, Entries: []*pb.Entry{{Data: []byte("somedata")}}})
ilog := newLog( ilog := newLog(
&MemoryStorage{ newMemoryStorageWithEnts([]pb.Entry{
ents: []pb.Entry{
{}, {Data: nil, Term: 1, Index: 1}, {}, {Data: nil, Term: 1, Index: 1},
{Data: nil, Term: 2, Index: 2}, {Data: nil, Term: 3, Index: 3}, {Data: nil, Term: 2, Index: 2}, {Data: nil, Term: 3, Index: 3},
{Data: []byte("somedata"), Term: 3, Index: 4}, {Data: []byte("somedata"), Term: 3, Index: 4},
}, }))
})
ilog.committed = 4 ilog.committed = 4
base := ltoa(ilog) base := ltoa(ilog)
for i, p := range tt.peers { for i, p := range tt.peers {