chore: move chainsync to legacychainsync

shutter-network · Oct 25, 2024 · ba7695d · ba7695d
1 parent 32ba27f
commit ba7695d
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/rolling-shutter/gnosisaccessnode/node.go b/rolling-shutter/gnosisaccessnode/node.go
@@ -9,8 +9,8 @@ import (
 	"github.com/shutter-network/shutter/shlib/shcrypto"
 
 	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
-	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
+	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"

diff --git a/rolling-shutter/keyperimpl/gnosis/keyper.go b/rolling-shutter/keyperimpl/gnosis/keyper.go
@@ -20,9 +20,9 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/beaconapiclient"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
-	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
+	chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
+	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/slotticker"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"

diff --git a/rolling-shutter/keyperimpl/gnosis/newblock.go b/rolling-shutter/keyperimpl/gnosis/newblock.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
-	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 )
 
 func (kpr *Keyper) processNewBlock(ctx context.Context, ev *syncevent.LatestBlock) error {

diff --git a/rolling-shutter/keyperimpl/gnosis/newkeyperset.go b/rolling-shutter/keyperimpl/gnosis/newkeyperset.go
@@ -9,7 +9,7 @@ import (
 
 	obskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
-	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
 )
 

diff --git a/rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go b/rolling-shutter/keyperimpl/optimism/bootstrap/bootstrap.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/rpc/client/http"
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/fx"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/shmsg"
 )
 

diff --git a/rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go b/rolling-shutter/keyperimpl/optimism/bootstrap/keyperset.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
+	chainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 )
 
 func GetKeyperSet(ctx context.Context, config *Config) error {

diff --git a/rolling-shutter/keyperimpl/optimism/keyper.go b/rolling-shutter/keyperimpl/optimism/keyper.go
@@ -17,11 +17,11 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/optimism/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
-	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
+	legacychainsync "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync"
+	syncevent "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
 )
@@ -30,7 +30,7 @@ var ErrParseKeyperSet = errors.New("can't parse KeyperSet")
 
 type Keyper struct {
 	core     *keyper.KeyperCore
-	l2Client *chainsync.Client
+	l2Client *legacychainsync.Client
 	dbpool   *pgxpool.Pool
 	config   *config.Config
 
@@ -79,12 +79,12 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 		return errors.Wrap(err, "can't instantiate keyper core")
 	}
 	// TODO: wrap the logger and pass in
-	kpr.l2Client, err = chainsync.NewClient(
+	kpr.l2Client, err = legacychainsync.NewClient(
 		ctx,
-		chainsync.WithClientURL(kpr.config.Optimism.JSONRPCURL),
-		chainsync.WithSyncNewBlock(kpr.newBlock),
-		chainsync.WithSyncNewKeyperSet(kpr.newKeyperSet),
-		chainsync.WithPrivateKey(kpr.config.Optimism.PrivateKey.Key),
+		legacychainsync.WithClientURL(kpr.config.Optimism.JSONRPCURL),
+		legacychainsync.WithSyncNewBlock(kpr.newBlock),
+		legacychainsync.WithSyncNewKeyperSet(kpr.newKeyperSet),
+		legacychainsync.WithPrivateKey(kpr.config.Optimism.PrivateKey.Key),
 	)
 	if err != nil {
 		return err

diff --git a/rolling-shutter/medley/chainsync/client.go → ...-shutter/medley/legacychainsync/client.go b/rolling-shutter/medley/chainsync/client.go → ...-shutter/medley/legacychainsync/client.go
@@ -11,9 +11,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/shutter-network/shop-contracts/bindings"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/syncer"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/syncer"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/logger"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"

diff --git a/...shutter/medley/chainsync/client/client.go → ...r/medley/legacychainsync/client/client.go b/...shutter/medley/chainsync/client/client.go → ...r/medley/legacychainsync/client/client.go
diff --git a/...-shutter/medley/chainsync/event/events.go → ...er/medley/legacychainsync/event/events.go b/...-shutter/medley/chainsync/event/events.go → ...er/medley/legacychainsync/event/events.go
diff --git a/...shutter/medley/chainsync/event/handler.go → ...r/medley/legacychainsync/event/handler.go b/...shutter/medley/chainsync/event/handler.go → ...r/medley/legacychainsync/event/handler.go
diff --git a/rolling-shutter/medley/chainsync/options.go → ...shutter/medley/legacychainsync/options.go b/rolling-shutter/medley/chainsync/options.go → ...shutter/medley/legacychainsync/options.go
@@ -11,10 +11,10 @@ import (
 	"github.com/shutter-network/shop-contracts/bindings"
 	"github.com/shutter-network/shop-contracts/predeploy"
 
-	syncclient "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/syncer"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
+	syncclient "github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/syncer"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )
 

diff --git a/...tter/medley/chainsync/syncer/eonpubkey.go → ...edley/legacychainsync/syncer/eonpubkey.go b/...tter/medley/chainsync/syncer/eonpubkey.go → ...edley/legacychainsync/syncer/eonpubkey.go
@@ -9,8 +9,8 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/shutter-network/shop-contracts/bindings"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )

diff --git a/...tter/medley/chainsync/syncer/keyperset.go → ...edley/legacychainsync/syncer/keyperset.go b/...tter/medley/chainsync/syncer/keyperset.go → ...edley/legacychainsync/syncer/keyperset.go
@@ -9,8 +9,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/shutter-network/shop-contracts/bindings"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )

diff --git a/...r/medley/chainsync/syncer/shutterstate.go → ...ey/legacychainsync/syncer/shutterstate.go b/...r/medley/chainsync/syncer/shutterstate.go → ...ey/legacychainsync/syncer/shutterstate.go
@@ -8,8 +8,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/shutter-network/shop-contracts/bindings"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )

diff --git a/...ter/medley/chainsync/syncer/unsafehead.go → ...dley/legacychainsync/syncer/unsafehead.go b/...ter/medley/chainsync/syncer/unsafehead.go → ...dley/legacychainsync/syncer/unsafehead.go
@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/event"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/event"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )

diff --git a/...g-shutter/medley/chainsync/syncer/util.go → ...ter/medley/legacychainsync/syncer/util.go b/...g-shutter/medley/chainsync/syncer/util.go → ...ter/medley/legacychainsync/syncer/util.go
@@ -8,8 +8,8 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
 
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync/client"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/encodeable/number"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/legacychainsync/client"
 )
 
 var (