Embedding bridge into delivery as a subcommand

Makefile

@@ -27,19 +27,13 @@ tests:
 
 build: clean
 	mkdir -p build
-	go build -o build/heimdalld ./cmd/heimdalld
-	go build -o build/heimdallcli ./cmd/heimdallcli
-	go build -o build/bridge bridge/bridge.go
-	mv build/heimdalld build/deliveryd
-	mv build/heimdallcli build/deliverycli
+	go build -o build/deliveryd ./cmd/deliveryd
+	go build -o build/deliverycli ./cmd/deliverycli
 	@echo "====================================================\n==================Build Successful==================\n===================================================="
 
 install:
-	go install $(BUILD_FLAGS) ./cmd/heimdalld
-	go install $(BUILD_FLAGS) ./cmd/heimdallcli
-	go install $(BUILD_FLAGS) bridge/bridge.go
-	mv $(GOPATH)/bin/heimdalld $(GOPATH)/bin/deliveryd
-	mv $(GOPATH)/bin/heimdallcli $(GOPATH)/bin/deliverycli
+	go install $(BUILD_FLAGS) ./cmd/deliveryd
+	go install $(BUILD_FLAGS) ./cmd/deliverycli
 
 contracts:
 	abigen --abi=contracts/rootchain/rootchain.abi --pkg=rootchain --out=contracts/rootchain/rootchain.go
@@ -50,51 +44,6 @@ contracts:
 	abigen --abi=contracts/stakinginfo/stakinginfo.abi --pkg=stakinginfo --out=contracts/stakinginfo/stakinginfo.go
 	abigen --abi=contracts/validatorset/validatorset.abi --pkg=validatorset --out=contracts/validatorset/validatorset.go
 	abigen --abi=contracts/erc20/erc20.abi --pkg=erc20 --out=contracts/erc20/erc20.go
-
-
-init-delivery:
-	./build/deliveryd init
-
-show-account-delivery:
-	./build/deliveryd show-account
-
-show-node-id:
-	./build/deliveryd tendermint show-node-id
-
-run-delivery:
-	./build/deliveryd start
-
-start-delivery:
-	mkdir -p ./logs &
-	./build/deliveryd start > ./logs/deliveryd.log &
-
-reset-delivery:
-	./build/deliveryd unsafe-reset-all
-	./build/bridge purge-queue
-	rm -rf ~/.deliveryd/bridge
-
-run-server:
-	./build/deliveryd rest-server
-
-start-server:
-	mkdir -p ./logs &
-	./build/deliveryd rest-server > ./logs/deliveryd-rest-server.log &
-
-start:
-	mkdir -p ./logs
-	bash docker/start.sh
-
-run-bridge:
-	./build/bridge start --all
-
-start-bridge:
-	mkdir -p logs &
-	./build/bridge start --all > ./logs/bridge.log &
-
-start-all:
-	mkdir -p ./logs
-	bash docker/start-deliveryd.sh
-
 #
 # Code quality
 #
@@ -113,13 +62,9 @@ endif
 build-docker:
 	@echo Fetching latest tag: $(LATEST_GIT_TAG)
 	git checkout $(LATEST_GIT_TAG)
-	docker build -t "maticnetwork/heimdall:$(LATEST_GIT_TAG)" -f docker/Dockerfile .
-
-push-docker:
-	@echo Pushing docker tag image: $(LATEST_GIT_TAG)
-	docker push "maticnetwork/heimdall:$(LATEST_GIT_TAG)"
+	docker build -t "delivery:$(LATEST_GIT_TAG)" -f docker/Dockerfile .
 
 build-docker-develop:
-	docker build -t "maticnetwork/heimdall:develop" -f docker/Dockerfile.develop .
+	docker build -t "delivery:develop" -f docker/Dockerfile.develop .
 
 .PHONY: contracts build

README.md

@@ -25,3 +25,8 @@ $ deliveryd start
 $ deliveryd rest-server 
 ```
 
+### Run-bridge 
+```bash 
+$ deliveryd bridge
+```
+

bridge/cmd/root.go

@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
 	"path/filepath"
 
 	"github.com/spf13/cobra"
@@ -28,9 +26,13 @@ var rootCmd = &cobra.Command{
 	},
 }
 
+func BridgeCommands() *cobra.Command {
+	return rootCmd
+}
+
 // InitTendermintViperConfig sets global viper configuration needed to heimdall
 func InitTendermintViperConfig(cmd *cobra.Command) {
-	tendermintNode, _ := cmd.Flags().GetString(helper.NodeFlag)
+	tendermintNode, _ := cmd.Flags().GetString(helper.TendermintNodeFlag)
 	homeValue, _ := cmd.Flags().GetString(helper.HomeFlag)
 	withDeliveryConfigValue, _ := cmd.Flags().GetString(helper.WithDeliveryConfigFlag)
 	bridgeDBValue, _ := cmd.Flags().GetString(bridgeDBFlag)
@@ -43,7 +45,7 @@ func InitTendermintViperConfig(cmd *cobra.Command) {
 	}
 
 	// set to viper
-	viper.Set(helper.NodeFlag, tendermintNode)
+	viper.Set(helper.TendermintNodeFlag, tendermintNode)
 	viper.Set(helper.HomeFlag, homeValue)
 	viper.Set(helper.WithDeliveryConfigFlag, withDeliveryConfigValue)
 	viper.Set(bridgeDBFlag, bridgeDBValue)
@@ -54,19 +56,11 @@ func InitTendermintViperConfig(cmd *cobra.Command) {
 	helper.InitDeliveryConfig("")
 }
 
-// Execute adds all child commands to the root command and sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute() {
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}
-
 func init() {
 	var logger = helper.Logger.With("module", "bridge/cmd/")
-	rootCmd.PersistentFlags().StringP(helper.NodeFlag, "n", "tcp://localhost:26657", "Node to connect to")
-	rootCmd.PersistentFlags().String(helper.HomeFlag, os.ExpandEnv("$HOME/.deliveryd"), "directory for config and data")
+
+	rootCmd.PersistentFlags().StringP(helper.TendermintNodeFlag, "n", helper.DefaultTendermintNode, "Node to connect to")
+	rootCmd.PersistentFlags().String(helper.HomeFlag, helper.DefaultNodeHome, "directory for config and data")
 	rootCmd.PersistentFlags().String(
 		helper.WithDeliveryConfigFlag,
 		"",

bridge/setu/broadcaster/broadcaster_test.go

@@ -17,8 +17,8 @@ func TestBroadcastToHeimdall(t *testing.T) {
 	t.Parallel()
 	cdc := app.MakeCodec()
 	// cli context
-	tendermintNode := "tcp://localhost:26657"
-	viper.Set(helper.NodeFlag, tendermintNode)
+	tendermintNode := helper.DefaultTendermintNode
+	viper.Set(helper.TendermintNodeFlag, tendermintNode)
 	viper.Set("log_level", "info")
 	// cliCtx := cliContext.NewCLIContext().WithCodec(cdc)
 	// cliCtx.BroadcastMode = client.BroadcastSync

cmd/heimdallcli/main.go → cmd/deliverycli/main.go

@@ -57,12 +57,12 @@ var (
 )
 
 func initTendermintViperConfig(cmd *cobra.Command) {
-	tendermintNode, _ := cmd.Flags().GetString(helper.NodeFlag)
+	tendermintNode, _ := cmd.Flags().GetString(helper.TendermintNodeFlag)
 	homeValue, _ := cmd.Flags().GetString(helper.HomeFlag)
 	withDeliveryConfigValue, _ := cmd.Flags().GetString(helper.WithDeliveryConfigFlag)
 
 	// set to viper
-	viper.Set(helper.NodeFlag, tendermintNode)
+	viper.Set(helper.TendermintNodeFlag, tendermintNode)
 	viper.Set(helper.HomeFlag, homeValue)
 	viper.Set(helper.WithDeliveryConfigFlag, withDeliveryConfigValue)
 

cmd/heimdalld/main.go → cmd/deliveryd/main.go

@@ -44,6 +44,7 @@ import (
 
 	"github.com/maticnetwork/heimdall/app"
 	authTypes "github.com/maticnetwork/heimdall/auth/types"
+	hmbridge "github.com/maticnetwork/heimdall/bridge/cmd"
 	"github.com/maticnetwork/heimdall/helper"
 	restServer "github.com/maticnetwork/heimdall/server"
 	hmTypes "github.com/maticnetwork/heimdall/types"
@@ -156,6 +157,7 @@ func main() {
 	rootCmd.AddCommand(showAccountCmd())
 	rootCmd.AddCommand(showPrivateKeyCmd())
 	rootCmd.AddCommand(restServer.ServeCommands(cdc, restServer.RegisterRoutes))
+	rootCmd.AddCommand(hmbridge.BridgeCommands())
 	rootCmd.AddCommand(VerifyGenesis(ctx, cdc))
 	rootCmd.AddCommand(initCmd(ctx, cdc))
 	rootCmd.AddCommand(testnetCmd(ctx, cdc))

helper/call_test.go

@@ -15,7 +15,7 @@ import (
 //  Test - to decode signers from checkpoint sigs data
 func TestCheckpointsigs(t *testing.T) {
 	tendermintNode := "tcp://localhost:26657"
-	viper.Set(NodeFlag, tendermintNode)
+	viper.Set(TendermintNodeFlag, tendermintNode)
 	viper.Set("log_level", "info")
 	InitDeliveryConfig(os.ExpandEnv("$HOME/.deliveryd"))
 

helper/config.go

@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	NodeFlag               = "node"
+	TendermintNodeFlag     = "node"
 	WithDeliveryConfigFlag = "with-delivery-config"
 	HomeFlag               = "home"
 	FlagClientHome         = "home-client"
@@ -97,7 +97,7 @@ const (
 
 	DefaultBttcChainID string = "15001"
 
-	DefaultChain string = "mainnet"
+	DefaultChain = "mainnet"
 
 	secretFilePerm = 0600
 )

helper/config_test.go

@@ -12,7 +12,7 @@ import (
 func TestHeimdallConfig(t *testing.T) {
 	// cli context
 	tendermintNode := "tcp://localhost:26657"
-	viper.Set(NodeFlag, tendermintNode)
+	viper.Set(TendermintNodeFlag, tendermintNode)
 	viper.Set("log_level", "info")
 	// cliCtx := cliContext.NewCLIContext().WithCodec(cdc)
 	// cliCtx.BroadcastMode = client.BroadcastSync

server/root.go

@@ -49,7 +49,7 @@ func ServeCommands(cdc *codec.Codec, registerRoutesFn func(*lcd.RestServer)) *co
 	cmd.Flags().String(client.FlagListenAddr, "tcp://0.0.0.0:1317", "The address for the server to listen on")
 	cmd.Flags().Bool(client.FlagTrustNode, true, "Trust connected full node (don't verify proofs for responses)")
 	cmd.Flags().String(client.FlagChainID, "", "The chain ID to connect to")
-	cmd.Flags().String(client.FlagNode, "tcp://localhost:26657", "Address of the node to connect to")
+	cmd.Flags().String(client.FlagNode, helper.DefaultTendermintNode, "Address of the node to connect to")
 	cmd.Flags().Int(client.FlagMaxOpenConnections, 1000, "The number of maximum open connections")
 
 	return cmd