Sitelet https://github.com/Fantom-foundation/go-opera/commit/b227b8ca79a6f2abd3f38d8ca755007f71a37bc1
Skip to content

Commit b227b8c

Browse files
rus-alexrus-alex
committed
testify/require instead of assert
1 parent d46c77f commit b227b8c

1 file changed

Lines changed: 15 additions & 40 deletions

File tree

‎inter/event_serializer_test.go‎

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/ethereum/go-ethereum/common"
1111
"github.com/ethereum/go-ethereum/core/types"
1212
"github.com/ethereum/go-ethereum/rlp"
13-
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
1414

1515
"github.com/Fantom-foundation/lachesis-base/hash"
1616
"github.com/Fantom-foundation/lachesis-base/inter/idx"
@@ -53,69 +53,44 @@ func TestEventPayloadSerialization(t *testing.T) {
5353
}
5454

5555
t.Run("ok", func(t *testing.T) {
56-
assertar := assert.New(t)
56+
require := require.New(t)
5757

5858
for name, header0 := range ee {
5959
buf, err := rlp.EncodeToBytes(&header0)
60-
if !assertar.NoError(err) {
61-
return
62-
}
60+
require.NoError(err)
6361

6462
var header1 EventPayload
6563
err = rlp.DecodeBytes(buf, &header1)
66-
if !assertar.NoError(err, name) {
67-
return
68-
}
64+
require.NoError(err, name)
6965

70-
if !assert.EqualValues(t, header0.extEventData, header1.extEventData, name) {
71-
return
72-
}
73-
if !assert.EqualValues(t, header0.sigData, header1.sigData, name) {
74-
return
75-
}
66+
require.EqualValues(header0.extEventData, header1.extEventData, name)
67+
require.EqualValues(header0.sigData, header1.sigData, name)
7668
for i := range header0.payloadData.txs {
77-
if !assert.EqualValues(t, header0.payloadData.txs[i].Hash(), header1.payloadData.txs[i].Hash(), name) {
78-
return
79-
}
80-
}
81-
if !assert.EqualValues(t, header0.baseEvent, header1.baseEvent, name) {
82-
return
83-
}
84-
if !assert.EqualValues(t, header0.ID(), header1.ID(), name) {
85-
return
86-
}
87-
if !assert.EqualValues(t, header0.HashToSign(), header1.HashToSign(), name) {
88-
return
89-
}
90-
if !assert.EqualValues(t, header0.Size(), header1.Size(), name) {
91-
return
69+
require.EqualValues(header0.payloadData.txs[i].Hash(), header1.payloadData.txs[i].Hash(), name)
9270
}
71+
require.EqualValues(header0.baseEvent, header1.baseEvent, name)
72+
require.EqualValues(header0.ID(), header1.ID(), name)
73+
require.EqualValues(header0.HashToSign(), header1.HashToSign(), name)
74+
require.EqualValues(header0.Size(), header1.Size(), name)
9375
}
9476
})
9577

9678
t.Run("err", func(t *testing.T) {
97-
assertar := assert.New(t)
79+
require := require.New(t)
9880

9981
for name, header0 := range ee {
10082
bin, err := header0.MarshalBinary()
101-
if !assertar.NoError(err, name) {
102-
return
103-
}
83+
require.NoError(err, name)
10484

10585
n := rand.Intn(len(bin) - len(header0.Extra()) - 1)
10686
bin = bin[0:n]
10787

10888
buf, err := rlp.EncodeToBytes(bin)
109-
if !assertar.NoError(err, name) {
110-
return
111-
}
89+
require.NoError(err, name)
11290

11391
var header1 Event
11492
err = rlp.DecodeBytes(buf, &header1)
115-
if !assertar.Error(err, name) {
116-
return
117-
}
118-
//t.Log(err)
93+
require.Error(err, name)
11994
}
12095
})
12196
}

0 commit comments

Comments
 (0)