Skip to content

Commit a9f26d8

Browse files
update sync monitor to not check for dkg and ws error to panic keyper
1 parent 77973dc commit a9f26d8

File tree

5 files changed

+10
-42
lines changed

5 files changed

+10
-42
lines changed

rolling-shutter/keyperimpl/shutterservice/syncmonitor.go

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ func (s *SyncMonitor) runCheck(
5959
keyperdb *keyperDB.Queries,
6060
lastBlockNumber *int64,
6161
) error {
62-
isRunning, err := s.isDKGRunning(ctx, keyperdb)
63-
if err != nil {
64-
return fmt.Errorf("syncMonitor | error in dkgIsRunning: %w", err)
65-
}
66-
if isRunning {
67-
log.Debug().Msg("dkg is running, skipping sync monitor checks")
68-
return nil
69-
}
70-
7162
record, err := db.GetIdentityRegisteredEventsSyncedUntil(ctx)
7263
if err != nil {
7364
if errors.Is(err, pgx.ErrNoRows) {
@@ -91,31 +82,3 @@ func (s *SyncMonitor) runCheck(
9182
Msg("block number has not increased between checks")
9283
return ErrBlockNotIncreasing
9384
}
94-
95-
func (s *SyncMonitor) isDKGRunning(ctx context.Context, keyperdb *keyperDB.Queries) (bool, error) {
96-
// if latest eon is registered then EonStarted event has triggered, which means the dkg can start
97-
eons, err := keyperdb.GetAllEons(ctx)
98-
if errors.Is(err, pgx.ErrNoRows) {
99-
return false, nil
100-
}
101-
if err != nil {
102-
log.Error().
103-
Err(err).
104-
Msg("syncMonitor | error getting all eons")
105-
return false, err
106-
}
107-
108-
if len(eons) == 0 {
109-
return false, nil
110-
}
111-
112-
// if we get no rows in getting dkg result then dkg is not completed for that eon
113-
_, err = keyperdb.GetDKGResult(ctx, eons[len(eons)-1].Eon)
114-
if errors.Is(err, pgx.ErrNoRows) {
115-
return true, nil
116-
} else if err != nil {
117-
log.Error().Err(err).Msg("syncMonitor | error getting dkg result")
118-
return false, err
119-
}
120-
return false, nil
121-
}

rolling-shutter/medley/chainsync/syncer/eonpubkey.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ func (s *EonPubKeySyncer) watchNewEonPubkey(ctx context.Context, subsErr <-chan
149149
}
150150
case err := <-subsErr:
151151
if err != nil {
152-
s.Log.Error("subscription error for watchNewEonPubkey", err)
152+
s.Log.Error("subscription error for watchNewEonPubkey", err.Error())
153+
return err
153154
}
154155
case <-ctx.Done():
155156
return ctx.Err()

rolling-shutter/medley/chainsync/syncer/keyperset.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ func (s *KeyperSetSyncer) watchNewKeypersService(ctx context.Context, subsErr <-
236236
}
237237
case err := <-subsErr:
238238
if err != nil {
239-
s.Log.Error("subscription error for watchNewKeypersService", err)
239+
s.Log.Error("subscription error for watchNewKeypersService", err.Error())
240+
return err
240241
}
241242
case <-ctx.Done():
242243
return ctx.Err()

rolling-shutter/medley/chainsync/syncer/shutterstate.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,13 @@ func (s *ShutterStateSyncer) watchPaused(ctx context.Context, subsErr <-chan err
125125
s.handle(ctx, ev)
126126
case err := <-subsErr:
127127
if err != nil {
128-
s.Log.Error("subscription error for watchPaused")
128+
s.Log.Error("subscription error for watchPaused", err.Error())
129+
return err
129130
}
130131
case err := <-subsErrUnpaused:
131132
if err != nil {
132-
s.Log.Error("subscription error for watchUnpaused", err)
133+
s.Log.Error("subscription error for watchUnpaused", err.Error())
134+
return err
133135
}
134136
case <-ctx.Done():
135137
return ctx.Err()

rolling-shutter/medley/chainsync/syncer/unsafehead.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ func (s *UnsafeHeadSyncer) watchLatestUnsafeHead(ctx context.Context, subsErr <-
6060
}
6161
case err := <-subsErr:
6262
if err != nil {
63-
s.Log.Error("subscription error for watchLatestUnsafeHead", err)
63+
s.Log.Error("subscription error for watchLatestUnsafeHead", err.Error())
64+
return err
6465
}
6566
case <-ctx.Done():
6667
return ctx.Err()

0 commit comments

Comments
 (0)