Skip to content

Commit 0309693

Browse files
authored
chore(lifecycle): disable service breaker (#4759)
1 parent b675540 commit 0309693

File tree

8 files changed

+19
-67
lines changed

8 files changed

+19
-67
lines changed

nodebuilder/das/constructors.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import (
1111

1212
"github.com/celestiaorg/celestia-node/das"
1313
"github.com/celestiaorg/celestia-node/header"
14-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
1514
"github.com/celestiaorg/celestia-node/share"
16-
"github.com/celestiaorg/celestia-node/share/eds/byzantine"
1715
"github.com/celestiaorg/celestia-node/share/shwap/p2p/shrex/shrexsub"
1816
)
1917

@@ -45,15 +43,6 @@ func newDASer(
4543
fraudServ fraud.Service[*header.ExtendedHeader],
4644
bFn shrexsub.BroadcastFn,
4745
options ...das.Option,
48-
) (*das.DASer, *modfraud.ServiceBreaker[*das.DASer, *header.ExtendedHeader], error) {
49-
ds, err := das.NewDASer(da, hsub, store, batching, fraudServ, bFn, options...)
50-
if err != nil {
51-
return nil, nil, err
52-
}
53-
54-
return ds, &modfraud.ServiceBreaker[*das.DASer, *header.ExtendedHeader]{
55-
Service: ds,
56-
FraudServ: fraudServ,
57-
FraudType: byzantine.BadEncoding,
58-
}, nil
46+
) (*das.DASer, error) {
47+
return das.NewDASer(da, hsub, store, batching, fraudServ, bFn, options...)
5948
}

nodebuilder/das/module.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import (
66
"go.uber.org/fx"
77

88
"github.com/celestiaorg/celestia-node/das"
9-
"github.com/celestiaorg/celestia-node/header"
10-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
119
"github.com/celestiaorg/celestia-node/nodebuilder/node"
1210
)
1311

@@ -41,11 +39,11 @@ func ConstructModule(tp node.Type, cfg *Config) fx.Option {
4139
baseComponents,
4240
fx.Provide(fx.Annotate(
4341
newDASer,
44-
fx.OnStart(func(ctx context.Context, breaker *modfraud.ServiceBreaker[*das.DASer, *header.ExtendedHeader]) error {
45-
return breaker.Start(ctx)
42+
fx.OnStart(func(ctx context.Context, daser *das.DASer) error {
43+
return daser.Start(ctx)
4644
}),
47-
fx.OnStop(func(ctx context.Context, breaker *modfraud.ServiceBreaker[*das.DASer, *header.ExtendedHeader]) error {
48-
return breaker.Stop(ctx)
45+
fx.OnStop(func(ctx context.Context, daser *das.DASer) error {
46+
return daser.Stop(ctx)
4947
}),
5048
)),
5149
// Module is needed for the RPC handler

nodebuilder/header/constructors.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ import (
1010
"github.com/libp2p/go-libp2p/p2p/net/conngater"
1111
"go.uber.org/fx"
1212

13-
libfraud "github.com/celestiaorg/go-fraud"
1413
libhead "github.com/celestiaorg/go-header"
1514
"github.com/celestiaorg/go-header/p2p"
1615
"github.com/celestiaorg/go-header/store"
1716
"github.com/celestiaorg/go-header/sync"
1817

19-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
2018
"github.com/celestiaorg/celestia-node/nodebuilder/node"
2119
modp2p "github.com/celestiaorg/celestia-node/nodebuilder/p2p"
22-
"github.com/celestiaorg/celestia-node/share/eds/byzantine"
2320
)
2421

2522
// newP2PExchange constructs a new Exchange for headers.
@@ -106,17 +103,6 @@ func newSyncer[H libhead.Header[H]](
106103
return syncer, nil
107104
}
108105

109-
func newFraudedSyncer[H libhead.Header[H]](
110-
fservice libfraud.Service[H],
111-
syncer *sync.Syncer[H],
112-
) *modfraud.ServiceBreaker[*sync.Syncer[H], H] {
113-
return &modfraud.ServiceBreaker[*sync.Syncer[H], H]{
114-
Service: syncer,
115-
FraudType: byzantine.BadEncoding,
116-
FraudServ: fservice,
117-
}
118-
}
119-
120106
// newStore constructs an initialized store
121107
func newStore[H libhead.Header[H]](
122108
lc fx.Lifecycle,

nodebuilder/header/module.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"github.com/celestiaorg/celestia-node/header"
1818
"github.com/celestiaorg/celestia-node/libs/pidstore"
19-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
2019
"github.com/celestiaorg/celestia-node/nodebuilder/node"
2120
modp2p "github.com/celestiaorg/celestia-node/nodebuilder/p2p"
2221
)
@@ -35,12 +34,11 @@ func ConstructModule[H libhead.Header[H]](tp node.Type, cfg *Config) fx.Option {
3534
fx.Provide(func(subscriber *p2p.Subscriber[H]) libhead.Subscriber[H] {
3635
return subscriber
3736
}),
38-
fx.Provide(newSyncer[H]),
3937
fx.Provide(fx.Annotate(
40-
newFraudedSyncer[H],
38+
newSyncer[H],
4139
fx.OnStart(func(
4240
ctx context.Context,
43-
breaker *modfraud.ServiceBreaker[*sync.Syncer[H], H],
41+
syncer *sync.Syncer[H],
4442
) error {
4543
// TODO(@Wondertan): This fix flakes in e2e tests
4644
// This is coming from the store asynchronity.
@@ -49,13 +47,13 @@ func ConstructModule[H libhead.Header[H]](tp node.Type, cfg *Config) fx.Option {
4947
// However, the Store doesn't makes it immediately available causing flakes
5048
// The proper fix will be in a follow up release after pruning.
5149
defer time.Sleep(time.Millisecond * 100)
52-
return breaker.Start(ctx)
50+
return syncer.Start(ctx)
5351
}),
5452
fx.OnStop(func(
5553
ctx context.Context,
56-
breaker *modfraud.ServiceBreaker[*sync.Syncer[H], H],
54+
syncer *sync.Syncer[H],
5755
) error {
58-
return breaker.Stop(ctx)
56+
return syncer.Stop(ctx)
5957
}),
6058
)),
6159
fx.Provide(fx.Annotate(

nodebuilder/header/service.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"github.com/celestiaorg/celestia-node/header"
1515
"github.com/celestiaorg/celestia-node/libs/utils"
16-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
1716
)
1817

1918
var tracer = otel.Tracer("header/service")
@@ -41,14 +40,13 @@ type syncer interface {
4140

4241
// newHeaderService creates a new instance of header Service.
4342
func newHeaderService(
44-
// getting Syncer wrapped in ServiceBreaker so we ensure service breaker is constructed
45-
syncer *modfraud.ServiceBreaker[*sync.Syncer[*header.ExtendedHeader], *header.ExtendedHeader],
43+
syncer *sync.Syncer[*header.ExtendedHeader],
4644
sub libhead.Subscriber[*header.ExtendedHeader],
4745
p2pServer *p2p.ExchangeServer[*header.ExtendedHeader],
4846
store libhead.Store[*header.ExtendedHeader],
4947
) Module {
5048
return &Service{
51-
syncer: syncer.Service,
49+
syncer: syncer,
5250
sub: sub,
5351
p2pServer: p2pServer,
5452
store: store,

nodebuilder/pruner/constructors.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import (
77
headsync "github.com/celestiaorg/go-header/sync"
88

99
"github.com/celestiaorg/celestia-node/header"
10-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
1110
"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
1211
modshare "github.com/celestiaorg/celestia-node/nodebuilder/share"
1312
"github.com/celestiaorg/celestia-node/pruner"
1413
)
1514

1615
// ensures Pruner always starts after Syncer
17-
type syncerAnchor = modfraud.ServiceBreaker[*headsync.Syncer[*header.ExtendedHeader], *header.ExtendedHeader]
16+
type syncerAnchor = headsync.Syncer[*header.ExtendedHeader]
1817

1918
func newPrunerService(
2019
p pruner.Pruner,

nodebuilder/state/core.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ import (
44
"github.com/cosmos/cosmos-sdk/crypto/keyring"
55
"google.golang.org/grpc"
66

7-
libfraud "github.com/celestiaorg/go-fraud"
87
"github.com/celestiaorg/go-header/sync"
98

109
"github.com/celestiaorg/celestia-node/header"
1110
"github.com/celestiaorg/celestia-node/nodebuilder/core"
12-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
1311
"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
14-
"github.com/celestiaorg/celestia-node/share/eds/byzantine"
1512
"github.com/celestiaorg/celestia-node/state"
1613
)
1714

@@ -22,14 +19,12 @@ func coreAccessor(
2219
keyring keyring.Keyring,
2320
keyname AccountName,
2421
sync *sync.Syncer[*header.ExtendedHeader],
25-
fraudServ libfraud.Service[*header.ExtendedHeader],
2622
network p2p.Network,
2723
client *grpc.ClientConn,
2824
additionalConns core.AdditionalCoreConns,
2925
) (
3026
*state.CoreAccessor,
3127
Module,
32-
*modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader],
3328
error,
3429
) {
3530
var opts []state.Option
@@ -51,10 +46,5 @@ func coreAccessor(
5146

5247
ca, err := state.NewCoreAccessor(keyring, string(keyname), sync, client, network.String(), nil, opts...)
5348

54-
sBreaker := &modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader]{
55-
Service: ca,
56-
FraudType: byzantine.BadEncoding,
57-
FraudServ: fraudServ,
58-
}
59-
return ca, ca, sBreaker, err
49+
return ca, ca, err
6050
}

nodebuilder/state/module.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ import (
77
logging "github.com/ipfs/go-log/v2"
88
"go.uber.org/fx"
99

10-
"github.com/celestiaorg/celestia-node/header"
1110
"github.com/celestiaorg/celestia-node/libs/fxutil"
1211
"github.com/celestiaorg/celestia-node/libs/keystore"
1312
"github.com/celestiaorg/celestia-node/nodebuilder/core"
14-
modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
1513
"github.com/celestiaorg/celestia-node/nodebuilder/node"
1614
"github.com/celestiaorg/celestia-node/state"
1715
)
@@ -31,15 +29,11 @@ func ConstructModule(tp node.Type, cfg *Config, coreCfg *core.Config) fx.Option
3129
}),
3230
fxutil.ProvideIf(coreCfg.IsEndpointConfigured(), fx.Annotate(
3331
coreAccessor,
34-
fx.OnStart(func(ctx context.Context,
35-
breaker *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader],
36-
) error {
37-
return breaker.Start(ctx)
32+
fx.OnStart(func(ctx context.Context, state *state.CoreAccessor) error {
33+
return state.Start(ctx)
3834
}),
39-
fx.OnStop(func(ctx context.Context,
40-
breaker *modfraud.ServiceBreaker[*state.CoreAccessor, *header.ExtendedHeader],
41-
) error {
42-
return breaker.Stop(ctx)
35+
fx.OnStop(func(ctx context.Context, state *state.CoreAccessor) error {
36+
return state.Stop(ctx)
4337
}),
4438
)),
4539
fxutil.ProvideIf(!coreCfg.IsEndpointConfigured(), func() (*state.CoreAccessor, Module) {

0 commit comments

Comments
 (0)