gnosis-keyper: move config to package

Author: ezdac

rolling-shutter/cmd/gnosiskeyper/gnosiskeyper.go

@@ -11,6 +11,7 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/shversion"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/gnosiskeyperwatcher"
 	keyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis"
+	keyperconfig "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration/command"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/db"
@@ -38,7 +39,7 @@ Shuttermint node which have to be started separately in advance.`,
 	return builder.Command()
 }
 
-func main(config *keyper.Config) error {
+func main(config *keyperconfig.Config) error {
 	log.Info().
 		Str("version", shversion.Version()).
 		Str("address", config.GetAddress().Hex()).
@@ -49,7 +50,7 @@ func main(config *keyper.Config) error {
 	return service.RunWithSighandler(context.Background(), kpr)
 }
 
-func initDB(cfg *keyper.Config) error {
+func initDB(cfg *keyperconfig.Config) error {
 	ctx := context.Background()
 	dbpool, err := pgxpool.Connect(ctx, cfg.DatabaseURL)
 	if err != nil {
@@ -59,7 +60,7 @@ func initDB(cfg *keyper.Config) error {
 	return db.InitDB(ctx, dbpool, database.Definition.Name(), database.Definition)
 }
 
-func watch(cfg *keyper.Config) error {
+func watch(cfg *keyperconfig.Config) error {
 	log.Info().Msg("starting monitor")
 	return service.RunWithSighandler(context.Background(), gnosiskeyperwatcher.New(cfg))
 }

rolling-shutter/gnosisaccessnode/config.go

@@ -3,7 +3,7 @@ package gnosisaccessnode
 import (
 	"io"
 
-	gnosiskeyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis"
+	gnosisconfig "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/metricsserver"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
@@ -13,7 +13,7 @@ type Config struct {
 	InstanceID uint64
 
 	GnosisNode *configuration.EthnodeConfig
-	Contracts  *gnosiskeyper.GnosisContractsConfig
+	Contracts  *gnosisconfig.GnosisContractsConfig
 	P2P        *p2p.Config
 	Metrics    *metricsserver.MetricsConfig
 
@@ -22,7 +22,7 @@ type Config struct {
 
 func (c *Config) Init() {
 	c.GnosisNode = configuration.NewEthnodeConfig()
-	c.Contracts = gnosiskeyper.NewGnosisContractsConfig()
+	c.Contracts = gnosisconfig.NewGnosisContractsConfig()
 	c.P2P = p2p.NewConfig()
 	c.Metrics = metricsserver.NewConfig()
 }

rolling-shutter/gnosiskeyperwatcher/blocks.go

@@ -8,12 +8,12 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/rs/zerolog/log"
 
-	keyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis"
+	gnosisconfig "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )
 
 type BlocksWatcher struct {
-	config        *keyper.Config
+	config        *gnosisconfig.Config
 	blocksChannel chan *BlockReceivedEvent
 }
 
@@ -22,7 +22,7 @@ type BlockReceivedEvent struct {
 	Time   time.Time
 }
 
-func NewBlocksWatcher(config *keyper.Config, blocksChannel chan *BlockReceivedEvent) *BlocksWatcher {
+func NewBlocksWatcher(config *gnosisconfig.Config, blocksChannel chan *BlockReceivedEvent) *BlocksWatcher {
 	return &BlocksWatcher{
 		config:        config,
 		blocksChannel: blocksChannel,

rolling-shutter/gnosiskeyperwatcher/keys.go

@@ -9,22 +9,22 @@ import (
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/rs/zerolog/log"
 
-	keyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis"
+	gnosisconfig "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2p"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/p2pmsg"
 )
 
 type KeysWatcher struct {
-	config        *keyper.Config
+	config        *gnosisconfig.Config
 	blocksChannel chan *BlockReceivedEvent
 
 	recentBlocksMux sync.Mutex
 	recentBlocks    map[uint64]*BlockReceivedEvent
 	mostRecentBlock uint64
 }
 
-func NewKeysWatcher(config *keyper.Config, blocksChannel chan *BlockReceivedEvent) *KeysWatcher {
+func NewKeysWatcher(config *gnosisconfig.Config, blocksChannel chan *BlockReceivedEvent) *KeysWatcher {
 	return &KeysWatcher{
 		config:          config,
 		blocksChannel:   blocksChannel,

rolling-shutter/gnosiskeyperwatcher/watcher.go

@@ -3,15 +3,15 @@ package gnosiskeyperwatcher
 import (
 	"context"
 
-	keyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis"
+	gnosisconfig "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )
 
 type Watcher struct {
-	config *keyper.Config
+	config *gnosisconfig.Config
 }
 
-func New(config *keyper.Config) *Watcher {
+func New(config *gnosisconfig.Config) *Watcher {
 	return &Watcher{
 		config: config,
 	}

rolling-shutter/keyperimpl/gnosis/config.go renamed to rolling-shutter/keyperimpl/gnosis/config/config.go

@@ -1,4 +1,4 @@
-package gnosis
+package config
 
 import (
 	"io"

rolling-shutter/keyperimpl/gnosis/messagingmiddleware.go

@@ -15,6 +15,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	obskeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/chainobserver/db/keyper"
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/gnosisssztypes"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
@@ -26,7 +27,7 @@ import (
 )
 
 type MessagingMiddleware struct {
-	config    *Config
+	config    *config.Config
 	messaging p2p.Messaging
 	dbpool    *pgxpool.Pool
 }
@@ -62,8 +63,8 @@ func (h *WrappedMessageHandler) HandleMessage(ctx context.Context, msg p2pmsg.Me
 	return replacedMsgs, nil
 }
 
-func NewMessagingMiddleware(messaging p2p.Messaging, dbpool *pgxpool.Pool, config *Config) *MessagingMiddleware {
-	return &MessagingMiddleware{messaging: messaging, dbpool: dbpool, config: config}
+func NewMessagingMiddleware(messaging p2p.Messaging, dbpool *pgxpool.Pool, cfg *config.Config) *MessagingMiddleware {
+	return &MessagingMiddleware{messaging: messaging, dbpool: dbpool, config: cfg}
 }
 
 func (i *MessagingMiddleware) Start(_ context.Context, runner service.Runner) error {