Skip to content

Commit ba7695d

Browse files
ezdacezdac
committed
chore: move chainsync to legacychainsync
1 parent 32ba27f commit ba7695d

File tree

17 files changed

+32
-32
lines changed

17 files changed

+32
-32
lines changed

‎rolling-shutter/gnosisaccessnode/node.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/shutter-network/shutter/shlib/shcrypto"
1010

1111
obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
12-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
13-
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
12+
chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
13+
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
1414
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver"
1515
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
1616
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"

‎rolling-shutter/keyperimpl/gnosis/keyper.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
2121
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/beaconapiclient"
2222
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
23-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
24-
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
2523
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
24+
chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
25+
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
2626
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
2727
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/slotticker"
2828
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"

‎rolling-shutter/keyperimpl/gnosis/newblock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55

66
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
7-
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
7+
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
88
)
99

1010
func (kpr *Keyper) processNewBlock(ctx context.Context, ev *syncevent.LatestBlock) error {

‎rolling-shutter/keyperimpl/gnosis/newkeyperset.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
obskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
1111
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
12-
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
12+
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
1313
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
1414
)
1515

‎rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/tendermint/tendermint/rpc/client/http"
1111

1212
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/fx"
13-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
13+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
1414
"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
1515
)
1616

‎rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"errors"
77
"os"
88

9-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
10-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
119
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
10+
chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
11+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
1212
)
1313

1414
func GetKeyperSet(ctx context.Context, config *Config) error {

‎rolling-shutter/keyperimpl/optimism/keyper.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import (
1717
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/optimism/database"
1818
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
1919
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
20-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
21-
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
2220
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
2321
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
2422
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
23+
legacychainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
24+
syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
2525
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
2626
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
2727
)
@@ -30,7 +30,7 @@ var ErrParseKeyperSet = errors.New("can't parse KeyperSet")
3030

3131
type Keyper struct {
3232
core *keyper.KeyperCore
33-
l2Client *chainsync.Client
33+
l2Client *legacychainsync.Client
3434
dbpool *pgxpool.Pool
3535
config *config.Config
3636

@@ -79,12 +79,12 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
7979
return errors.Wrap(err, "can't instantiate keyper core")
8080
}
8181
// TODO: wrap the logger and pass in
82-
kpr.l2Client, err = chainsync.NewClient(
82+
kpr.l2Client, err = legacychainsync.NewClient(
8383
ctx,
84-
chainsync.WithClientURL(kpr.config.Optimism.JSONRPCURL),
85-
chainsync.WithSyncNewBlock(kpr.newBlock),
86-
chainsync.WithSyncNewKeyperSet(kpr.newKeyperSet),
87-
chainsync.WithPrivateKey(kpr.config.Optimism.PrivateKey.Key),
84+
legacychainsync.WithClientURL(kpr.config.Optimism.JSONRPCURL),
85+
legacychainsync.WithSyncNewBlock(kpr.newBlock),
86+
legacychainsync.WithSyncNewKeyperSet(kpr.newKeyperSet),
87+
legacychainsync.WithPrivateKey(kpr.config.Optimism.PrivateKey.Key),
8888
)
8989
if err != nil {
9090
return err

rolling-shutter/medley/chainsync/client.go renamed to rolling-shutter/medley/legacychainsync/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/pkg/errors"
1212
"github.com/shutter-network/shop-contracts/bindings"
1313

14-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
15-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
16-
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/syncer"
14+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
15+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
16+
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/syncer"
1717
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
1818
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/logger"
1919
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"

rolling-shutter/medley/chainsync/client/client.go renamed to rolling-shutter/medley/legacychainsync/client/client.go

File renamed without changes.

rolling-shutter/medley/chainsync/event/events.go renamed to rolling-shutter/medley/legacychainsync/event/events.go

File renamed without changes.

0 commit comments

Comments
 (0)