Rename opera to sonicd

Makefile

@@ -1,16 +1,16 @@
 .PHONY: all
-all: opera sonictool
+all: sonicd sonictool
 
 GOPROXY ?= "https://proxy.golang.org,direct"
-.PHONY: opera
-opera:
+.PHONY: sonicd sonictool
+sonicd:
 	GIT_COMMIT=`git rev-list -1 HEAD 2>/dev/null || echo ""` && \
 	GIT_DATE=`git log -1 --date=short --pretty=format:%ct 2>/dev/null || echo ""` && \
 	GOPROXY=$(GOPROXY) \
 	go build \
 	    -ldflags "-s -w -X github.com/Fantom-foundation/go-opera/config.GitCommit=$${GIT_COMMIT} -X github.com/Fantom-foundation/go-opera/config.GitDate=$${GIT_DATE}" \
-	    -o build/opera \
-	    ./cmd/opera
+	    -o build/sonicd \
+	    ./cmd/sonicd
 
 sonictool:
 	GIT_COMMIT=`git rev-list -1 HEAD 2>/dev/null || echo ""` && \
@@ -22,11 +22,11 @@ sonictool:
 	    ./cmd/sonictool
 
 TAG ?= "latest"
-.PHONY: opera-image
-opera-image:
+.PHONY: sonic-image
+sonic-image:
 	docker build \
     	    --network=host \
-    	    -f ./docker/Dockerfile.opera -t "opera:$(TAG)" .
+    	    -f ./docker/Dockerfile.opera -t "sonic:$(TAG)" .
 
 .PHONY: test
 test:

cmd/opera/launcher/accounts.go → cmd/sonicd/accounts.go

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package launcher
+package main
 
 import (
 	"fmt"

cmdhelper/helpers.go → cmd/sonicd/cmdhelper/helpers.go

@@ -17,10 +17,6 @@
 package cmdhelper
 
 import (
-	"os"
-	"path/filepath"
-
-	"github.com/ethereum/go-ethereum/params"
 	cli "gopkg.in/urfave/cli.v1"
 )
 
@@ -76,7 +72,7 @@ type FlagGroup struct {
 	Flags []cli.Flag
 }
 
-// byCategory sorts an array of FlagGroup by Name in the order
+// ByCategory sorts an array of FlagGroup by Name in the order
 // defined in AppHelpFlagGroups.
 type ByCategory []FlagGroup
 
@@ -108,14 +104,3 @@ func FlagCategory(flag cli.Flag, flagGroups []FlagGroup) string {
 	}
 	return "MISC"
 }
-
-// NewApp creates an app with sane defaults.
-func NewApp(gitCommit, gitDate, usage string) *cli.App {
-	app := cli.NewApp()
-	app.Name = filepath.Base(os.Args[0])
-	app.Author = ""
-	app.Email = ""
-	app.Version = params.VersionWithCommit(gitCommit, gitDate)
-	app.Usage = usage
-	return app
-}

cmd/opera/launcher/fake_test.go → cmd/sonicd/fake_test.go

@@ -1,4 +1,4 @@
-package launcher
+package main
 
 import (
 	"github.com/Fantom-foundation/go-opera/config"

cmd/opera/launcher/launcher.go → cmd/sonicd/launcher.go

@@ -1,11 +1,14 @@
-package launcher
+package main
 
 import (
 	"fmt"
-	"github.com/Fantom-foundation/go-opera/cmd/opera/launcher/diskusage"
+	"github.com/Fantom-foundation/go-opera/cmd/sonicd/diskusage"
+	"github.com/Fantom-foundation/go-opera/cmd/sonicd/metrics"
+	"github.com/Fantom-foundation/go-opera/cmd/sonicd/tracing"
 	"github.com/Fantom-foundation/go-opera/config"
 	"github.com/Fantom-foundation/go-opera/config/flags"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	"github.com/ethereum/go-ethereum/params"
 	"os"
 	"os/signal"
 	"sort"
@@ -20,18 +23,15 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/discover/discfilter"
 	"gopkg.in/urfave/cli.v1"
 
-	evmetrics "github.com/ethereum/go-ethereum/metrics"
+	ethmetrics "github.com/ethereum/go-ethereum/metrics"
 
-	"github.com/Fantom-foundation/go-opera/cmd/opera/launcher/metrics"
-	"github.com/Fantom-foundation/go-opera/cmd/opera/launcher/tracing"
-	"github.com/Fantom-foundation/go-opera/cmdhelper"
 	"github.com/Fantom-foundation/go-opera/debug"
 	_ "github.com/Fantom-foundation/go-opera/version"
 )
 
 var (
 	// The app that holds all commands and flags.
-	app = cmdhelper.NewApp(config.GitCommit, config.GitDate, "the go-opera command line interface")
+	app *cli.App
 
 	nodeFlags        []cli.Flag
 	testFlags        []cli.Flag
@@ -162,11 +162,14 @@ func initApp() {
 
 	initFlags()
 
+	app = cli.NewApp()
+	app.Name = "sonicd"
+	app.Usage = "the go-sonic service"
+	app.Version = params.VersionWithCommit(config.GitCommit, config.GitDate)
 	app.Action = lachesisMain
 	app.HideVersion = true // we have a command to print the version
 	app.Commands = []cli.Command{
 		versionCommand,
-		licenseCommand,
 	}
 	sort.Sort(cli.CommandsByName(app.Commands))
 
@@ -184,7 +187,7 @@ func initApp() {
 		// Start metrics export if enabled
 		metrics.SetupMetrics(ctx)
 		// Start system runtime metrics collection
-		go evmetrics.CollectProcessMetrics(3 * time.Second)
+		go ethmetrics.CollectProcessMetrics(3 * time.Second)
 		return nil
 	}
 
@@ -196,12 +199,6 @@ func initApp() {
 	}
 }
 
-func Launch(args []string) error {
-	initApp()
-	initAppHelp()
-	return app.Run(args)
-}
-
 // opera is the main entry point into the system if no special subcommand is ran.
 // It creates a default node based on the command line arguments and runs it in
 // blocking mode, waiting for it to be shut down.

cmd/sonicd/main.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+func main() {
+	initApp()
+	initAppHelp()
+
+	if err := app.Run(os.Args); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+}

cmd/opera/launcher/misccmd.go → cmd/sonicd/misccmd.go

@@ -1,4 +1,4 @@
-package launcher
+package main
 
 import (
 	"fmt"
@@ -22,14 +22,6 @@ var (
 The output of this command is supposed to be machine-readable.
 `,
 	}
-
-	licenseCommand = cli.Command{
-		Action:    license,
-		Name:      "license",
-		Usage:     "Display license information",
-		ArgsUsage: " ",
-		Category:  "MISCELLANEOUS COMMANDS",
-	}
 )
 
 func version(ctx *cli.Context) error {
@@ -49,9 +41,3 @@ func version(ctx *cli.Context) error {
 	fmt.Printf("GOROOT=%s\n", runtime.GOROOT())
 	return nil
 }
-
-func license(_ *cli.Context) error {
-	// TODO: license text
-	fmt.Println(``)
-	return nil
-}

cmd/opera/launcher/run_test.go → cmd/sonicd/run_test.go

@@ -1,4 +1,4 @@
-package launcher
+package main
 
 import (
 	"context"

cmd/opera/launcher/unlocking_test.go → cmd/sonicd/unlocking_test.go

@@ -1,4 +1,4 @@
-package launcher
+package main
 
 import (
 	"path/filepath"

cmd/opera/launcher/usage.go → cmd/sonicd/usage.go

@@ -16,16 +16,16 @@
 
 // Contains the geth command usage template and generator.
 
-package launcher
+package main
 
 import (
+	"github.com/Fantom-foundation/go-opera/cmd/sonicd/cmdhelper"
 	"github.com/Fantom-foundation/go-opera/config"
 	"io"
 	"sort"
 
 	cli "gopkg.in/urfave/cli.v1"
 
-	"github.com/Fantom-foundation/go-opera/cmdhelper"
 	"github.com/Fantom-foundation/go-opera/debug"
 )
 

cmd/sonictool/main.go

@@ -2,17 +2,20 @@ package main
 
 import (
 	"fmt"
-	"github.com/Fantom-foundation/go-opera/cmdhelper"
 	"github.com/Fantom-foundation/go-opera/config"
 	"github.com/Fantom-foundation/go-opera/config/flags"
 	_ "github.com/Fantom-foundation/go-opera/version"
+	"github.com/ethereum/go-ethereum/params"
 	"gopkg.in/urfave/cli.v1"
 	"os"
 	"sort"
 )
 
 func main() {
-	app := cmdhelper.NewApp(config.GitCommit, config.GitDate, "the Sonic management tool")
+	app := cli.NewApp()
+	app.Name = "sonictool"
+	app.Usage = "the Sonic management tool"
+	app.Version = params.VersionWithCommit(config.GitCommit, config.GitDate)
 	app.Flags = []cli.Flag{
 		flags.DataDirFlag,
 		flags.CacheFlag,