@@ -12,7 +12,6 @@ import (
1212 "github.com/stretchr/testify/assert"
1313 "github.com/stretchr/testify/require"
1414
15- "github.com/celestiaorg/go-fraud/fraudtest"
1615 libhead "github.com/celestiaorg/go-header"
1716
1817 "github.com/celestiaorg/celestia-node/header"
@@ -31,12 +30,12 @@ func TestDASerLifecycle(t *testing.T) {
3130 avail := mocks .NewMockAvailability (ctrl )
3231 avail .EXPECT ().SharesAvailable (gomock .Any (), gomock .Any ()).AnyTimes ().Return (nil )
3332 // 15 headers from the past and 15 future headers
34- mockGet , sub , mockService := createDASerSubcomponents (t , 15 , 15 )
33+ mockGet , sub := createDASerSubcomponents (t , 15 , 15 )
3534
3635 ctx , cancel := context .WithTimeout (context .Background (), timeout )
3736 t .Cleanup (cancel )
3837
39- daser , err := NewDASer (avail , sub , mockGet , ds , mockService , newBroadcastMock (1 ))
38+ daser , err := NewDASer (avail , sub , mockGet , ds , newBroadcastMock (1 ))
4039 require .NoError (t , err )
4140
4241 err = daser .Start (ctx )
@@ -62,12 +61,12 @@ func TestDASer_Restart(t *testing.T) {
6261 avail := mocks .NewMockAvailability (ctrl )
6362 avail .EXPECT ().SharesAvailable (gomock .Any (), gomock .Any ()).AnyTimes ().Return (nil )
6463 // 15 headers from the past and 15 future headers
65- mockGet , sub , mockService := createDASerSubcomponents (t , 15 , 15 )
64+ mockGet , sub := createDASerSubcomponents (t , 15 , 15 )
6665
6766 ctx , cancel := context .WithTimeout (context .Background (), timeout )
6867 t .Cleanup (cancel )
6968
70- daser , err := NewDASer (avail , sub , mockGet , ds , mockService , newBroadcastMock (1 ))
69+ daser , err := NewDASer (avail , sub , mockGet , ds , newBroadcastMock (1 ))
7170 require .NoError (t , err )
7271
7372 err = daser .Start (ctx )
@@ -88,7 +87,7 @@ func TestDASer_Restart(t *testing.T) {
8887 restartCtx , restartCancel := context .WithTimeout (context .Background (), timeout )
8988 t .Cleanup (restartCancel )
9089
91- daser , err = NewDASer (avail , sub , mockGet , ds , mockService , newBroadcastMock (1 ))
90+ daser , err = NewDASer (avail , sub , mockGet , ds , newBroadcastMock (1 ))
9291 require .NoError (t , err )
9392
9493 err = daser .Start (restartCtx )
@@ -105,77 +104,6 @@ func TestDASer_Restart(t *testing.T) {
105104 assert .EqualValues (t , 60 , checkpoint .SampleFrom - 1 )
106105}
107106
108- // TODO(@walldiss): BEFP test will not work until BEFP-shwap integration
109- // func TestDASer_stopsAfter_BEFP(t *testing.T) {
110- // ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
111- // t.Cleanup(cancel)
112- //
113- // ds := ds_sync.MutexWrap(datastore.NewMapDatastore())
114- // // create mock network
115- // net, err := mocknet.FullMeshLinked(1)
116- // require.NoError(t, err)
117- // // create pubsub for host
118- // ps, err := pubsub.NewGossipSub(ctx, net.Hosts()[0],
119- // pubsub.WithMessageSignaturePolicy(pubsub.StrictNoSign))
120- // require.NoError(t, err)
121- //
122- // ctrl := gomock.NewController(t)
123- // avail := mocks.NewMockAvailability(ctrl)
124- // avail.EXPECT().SharesAvailable(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
125- // // 15 headers from the past and 15 future headers
126- // mockGet, sub, _ := createDASerSubcomponents(t, 15, 15)
127- //
128- // // create fraud service and break one header
129- // getter := func(ctx context.Context, height uint64) (*header.ExtendedHeader, error) {
130- // return mockGet.GetByHeight(ctx, height)
131- // }
132- // headGetter := func(ctx context.Context) (*header.ExtendedHeader, error) {
133- // return mockGet.Head(ctx)
134- // }
135- // unmarshaler := fraud.MultiUnmarshaler[*header.ExtendedHeader]{
136- // Unmarshalers: map[fraud.ProofType]func([]byte) (fraud.Proof[*header.ExtendedHeader], error){
137- // byzantine.BadEncoding: func(data []byte) (fraud.Proof[*header.ExtendedHeader], error) {
138- // befp := &byzantine.BadEncodingProof{}
139- // return befp, befp.UnmarshalBinary(data)
140- // },
141- // },
142- // }
143- //
144- // fserv := fraudserv.NewProofService[*header.ExtendedHeader](ps,
145- // net.Hosts()[0],
146- // getter,
147- // headGetter,
148- // unmarshaler,
149- // ds,
150- // false,
151- // "private",
152- // )
153- // require.NoError(t, fserv.Start(ctx))
154- // mockGet.headers[1] = headerfraud.CreateFraudExtHeader(t, mockGet.headers[1])
155- // newCtx := context.Background()
156- //
157- // // create and start DASer
158- // daser, err := NewDASer(avail, sub, mockGet, ds, fserv, newBroadcastMock(1))
159- // require.NoError(t, err)
160- //
161- // resultCh := make(chan error)
162- // go fraud.OnProof[*header.ExtendedHeader](newCtx, fserv, byzantine.BadEncoding,
163- // func(fraud.Proof[*header.ExtendedHeader]) {
164- // resultCh <- daser.Stop(newCtx)
165- // })
166- //
167- // require.NoError(t, daser.Start(newCtx))
168- // // wait for fraud proof will be handled
169- // select {
170- // case <-ctx.Done():
171- // t.Fatal(ctx.Err())
172- // case res := <-resultCh:
173- // require.NoError(t, res)
174- // }
175- // // wait for manager to finish catchup
176- // require.False(t, daser.running.Load())
177- //}
178-
179107func TestDASerSampleTimeout (t * testing.T ) {
180108 ctx , cancel := context .WithTimeout (context .Background (), time .Second * 5 )
181109 t .Cleanup (cancel )
@@ -202,10 +130,9 @@ func TestDASerSampleTimeout(t *testing.T) {
202130
203131 ds := ds_sync .MutexWrap (datastore .NewMapDatastore ())
204132 sub := new (headertest.Subscriber )
205- fserv := & fraudtest.DummyService [* header.ExtendedHeader ]{}
206133
207134 // create and start DASer
208- daser , err := NewDASer (avail , sub , getter , ds , fserv , newBroadcastMock (1 ),
135+ daser , err := NewDASer (avail , sub , getter , ds , newBroadcastMock (1 ),
209136 WithSampleTimeout (1 ))
210137 require .NoError (t , err )
211138
@@ -230,11 +157,9 @@ func createDASerSubcomponents(
230157) (
231158 libhead.Store [* header.ExtendedHeader ],
232159 libhead.Subscriber [* header.ExtendedHeader ],
233- * fraudtest.DummyService [* header.ExtendedHeader ],
234160) {
235161 mockGet , sub := createMockGetterAndSub (t , numGetter , numSub )
236- fraud := & fraudtest.DummyService [* header.ExtendedHeader ]{}
237- return mockGet , sub , fraud
162+ return mockGet , sub
238163}
239164
240165func createMockGetterAndSub (
0 commit comments