Merge pull request #520 from shutter-network/cleanups

Cleanups

Author: ulope

rolling-shutter/cmd/collator/collator.go

@@ -5,16 +5,11 @@ import (
 
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/bootstrap"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/chain"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/collator"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/cryptocmd"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/gnosisaccessnode"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/gnosiskeyper"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/mocknode"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/mocksequencer"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/optimism"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/p2pnode"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/proxy"
-	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/rollupkeyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/snapshot"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd/snapshotkeyper"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/rootcmd"
@@ -24,18 +19,13 @@ func Subcommands() []*cobra.Command {
 	return []*cobra.Command{
 		bootstrap.Cmd(),
 		chain.Cmd(),
-		collator.Cmd(),
 		optimism.Cmd(),
 		optimism.OPBootstrapCmd(),
-		rollupkeyper.Cmd(),
-		mocknode.Cmd(),
 		snapshot.Cmd(),
 		snapshotkeyper.Cmd(),
 		gnosiskeyper.Cmd(),
 		gnosisaccessnode.Cmd(),
 		cryptocmd.Cmd(),
-		proxy.Cmd(),
-		mocksequencer.Cmd(),
 		p2pnode.Cmd(),
 	}
 }

rolling-shutter/cmd/collator/collator_test.go

@@ -5,21 +5,21 @@ import (
 
 	"gotest.tools/assert"
 
-	keyper "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/rollup"
+	config "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/optimism/config"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/configuration/test"
 )
 
 func TestSmokeGenerateConfig(t *testing.T) {
-	config := keyper.NewConfig()
-	test.SmokeGenerateConfig(t, config)
+	c := config.NewConfig()
+	test.SmokeGenerateConfig(t, c)
 }
 
 func TestParsedConfig(t *testing.T) {
-	config := keyper.NewConfig()
+	c := config.NewConfig()
 
-	err := configuration.SetExampleValuesRecursive(config)
+	err := configuration.SetExampleValuesRecursive(c)
 	assert.NilError(t, err)
-	parsedConfig := test.RoundtripParseConfig(t, config)
-	assert.DeepEqual(t, config, parsedConfig)
+	parsedConfig := test.RoundtripParseConfig(t, c)
+	assert.DeepEqual(t, c, parsedConfig)
 }