Skip to content

Commit 8864299

Browse files
committed
fix using msg.eon to fetch the keyper set in messaging middleware
1 parent 05b0a80 commit 8864299

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

rolling-shutter/keyperimpl/gnosis/messagingmiddleware.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"google.golang.org/protobuf/proto"
1616

1717
obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
18-
corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
1918
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
2019
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/gnosisssztypes"
2120
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
@@ -206,7 +205,6 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
206205
}
207206

208207
gnosisDB := database.New(i.dbpool)
209-
keyperCoreDB := corekeyperdatabase.New(i.dbpool)
210208
obsKeyperDB := obskeyperdatabase.New(i.dbpool)
211209

212210
trigger, err := gnosisDB.GetCurrentDecryptionTrigger(ctx, int64(originalMsg.Eon))
@@ -220,11 +218,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
220218
return nil, errors.Wrapf(err, "failed to get current decryption trigger for eon %d", originalMsg.Eon)
221219
}
222220

223-
eonData, err := keyperCoreDB.GetEon(ctx, int64(originalMsg.Eon))
224-
if err != nil {
225-
return nil, errors.Wrapf(err, "failed to get eon data from database for eon %d", originalMsg.Eon)
226-
}
227-
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, eonData.KeyperConfigIndex)
221+
keyperSet, err := obsKeyperDB.GetKeyperSetByKeyperConfigIndex(ctx, int64(originalMsg.Eon))
228222
if err != nil {
229223
return nil, errors.Wrapf(err, "failed to get keyper set from database for eon %d", originalMsg.Eon)
230224
}

0 commit comments

Comments
 (0)