Revert "op-node: Add p2p utils"

op-node/cmd/main.go

@@ -9,8 +9,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-node/cmd/p2p"
-
 	"github.com/ethereum-optimism/optimism/op-node/metrics"
 
 	opnode "github.com/ethereum-optimism/optimism/op-node"
@@ -55,23 +53,13 @@ func main() {
 	)
 
 	app := cli.NewApp()
+	app.Flags = flags.Flags
 	app.Version = VersionWithMeta
-	app.Flags = flags.GlobalFlags
 	app.Name = "opnode"
 	app.Usage = "Optimism Rollup Node"
 	app.Description = "The deposit only rollup node drives the L2 execution engine based on L1 deposits."
-	app.Commands = []cli.Command{
-		{
-			Name:        "p2p",
-			Subcommands: p2p.Subcommands,
-		},
-		{
-			Name:   "start",
-			Action: RollupNodeMain,
-			Flags:  flags.Flags,
-		},
-	}
 
+	app.Action = RollupNodeMain
 	err := app.Run(os.Args)
 	if err != nil {
 		log.Crit("Application failed", "message", err)

op-node/flags/flags.go

@@ -150,6 +150,9 @@ var optionalFlags = append([]cli.Flag{
 	VerifierL1Confs,
 	SequencerEnabledFlag,
 	SequencerL1Confs,
+	LogLevelFlag,
+	LogFormatFlag,
+	LogColorFlag,
 	MetricsEnabledFlag,
 	MetricsAddrFlag,
 	MetricsPortFlag,
@@ -159,12 +162,5 @@ var optionalFlags = append([]cli.Flag{
 	SnapshotLog,
 }, p2pFlags...)
 
-// GlobalFlags contains the list of configuration options available to every command.
-var GlobalFlags = []cli.Flag{
-	LogLevelFlag,
-	LogFormatFlag,
-	LogColorFlag,
-}
-
-// Flags contains the list of configuration options available to the start command.
+// Flags contains the list of configuration options available to the binary.
 var Flags = append(requiredFlags, optionalFlags...)

ops-bedrock/docker-compose.yml

@@ -45,7 +45,6 @@ services:
       dockerfile: ./op-node/Dockerfile
     command: >
       op-node
-      start
       --l1=ws://l1:8546
       --l2=ws://l2:8546
       --l2.jwt-secret=/config/test-jwt-secret.txt