From e92fab02f157291e2730f3124346eaf75fdf7683 Mon Sep 17 00:00:00 2001
From: elizabeth <elizabethjbinks@gmail.com>
Date: Mon, 16 Oct 2023 15:01:03 -0400
Subject: [PATCH] remove all mentions of metro

---
 cmd/geth/main.go                         |  6 ------
 cmd/utils/flags.go                       | 22 ----------------------
 eth/api_backend.go                       |  5 -----
 eth/ethconfig/config.go                  |  8 --------
 internal/ethapi/backend.go               |  3 ---
 internal/ethapi/transaction_args_test.go |  1 -
 les/api_backend.go                       |  5 -----
 7 files changed, 50 deletions(-)

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 50e97d7d97..03c9f29157 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -185,11 +185,6 @@ var (
 		utils.GRPCPortFlag,
 	}
 
-	metroFlags = []cli.Flag{
-		utils.MetroGRPCHostFlag,
-		utils.MetroGRPCPortFlag,
-	}
-
 	metricsFlags = []cli.Flag{
 		utils.MetricsEnabledFlag,
 		utils.MetricsEnabledExpensiveFlag,
@@ -253,7 +248,6 @@ func init() {
 	app.Flags = flags.Merge(
 		nodeFlags,
 		rpcFlags,
-		metroFlags,
 		consoleFlags,
 		debug.Flags,
 		metricsFlags,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 21733c1bf7..1d7fedb72e 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -811,20 +811,6 @@ var (
 		Category: flags.APICategory,
 	}
 
-	// Metro grpc address and port overrides
-	MetroGRPCHostFlag = &cli.StringFlag{
-		Name:     "metro.addr",
-		Usage:    "Metro gRPC server listening interface",
-		Value:    ethconfig.Defaults.MetroGRPCHost,
-		Category: flags.APICategory,
-	}
-	MetroGRPCPortFlag = &cli.IntFlag{
-		Name:     "metro.port",
-		Usage:    "Metro gRPC server listening port",
-		Value:    ethconfig.Defaults.MetroGRPCPort,
-		Category: flags.APICategory,
-	}
-
 	// Network Settings
 	MaxPeersFlag = &cli.IntFlag{
 		Name:     "maxpeers",
@@ -1905,14 +1891,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		}
 	}
 
-	// metro
-	if ctx.IsSet(MetroGRPCHostFlag.Name) {
-		cfg.MetroGRPCHost = ctx.String(MetroGRPCHostFlag.Name)
-	}
-	if ctx.IsSet(MetroGRPCPortFlag.Name) {
-		cfg.MetroGRPCPort = ctx.Int(MetroGRPCPortFlag.Name)
-	}
-
 	// Override any default configs for hard coded networks.
 	switch {
 	case ctx.Bool(MainnetFlag.Name):
diff --git a/eth/api_backend.go b/eth/api_backend.go
index 8ed7209124..ac160b0736 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -19,7 +19,6 @@ package eth
 import (
 	"context"
 	"errors"
-	"fmt"
 	"math/big"
 	"time"
 
@@ -352,10 +351,6 @@ func (b *EthAPIBackend) UnprotectedAllowed() bool {
 	return b.allowUnprotectedTxs
 }
 
-func (b *EthAPIBackend) MetroGRPCEndpoint() string {
-	return fmt.Sprintf("%s:%d", b.eth.config.MetroGRPCHost, b.eth.config.MetroGRPCPort)
-}
-
 func (b *EthAPIBackend) RPCGasCap() uint64 {
 	return b.eth.config.RPCGasCap
 }
diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
index 2f64014f5a..db686c5d08 100644
--- a/eth/ethconfig/config.go
+++ b/eth/ethconfig/config.go
@@ -90,10 +90,6 @@ var Defaults = Config{
 	RPCEVMTimeout:           5 * time.Second,
 	GPO:                     FullNodeGPO,
 	RPCTxFeeCap:             1, // 1 ether
-
-	// Metro GRPC
-	MetroGRPCHost: "localhost",
-	MetroGRPCPort: 9090,
 }
 
 func init() {
@@ -211,10 +207,6 @@ type Config struct {
 
 	// OverrideShanghai (TODO: remove after the fork)
 	OverrideShanghai *uint64 `toml:",omitempty"`
-
-	// Metro GRPC Host and Port
-	MetroGRPCHost string `toml:",omitempty"`
-	MetroGRPCPort int    `toml:",omitempty"`
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain configuration.
diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
index 35da9e7234..0249c8664d 100644
--- a/internal/ethapi/backend.go
+++ b/internal/ethapi/backend.go
@@ -97,9 +97,6 @@ type Backend interface {
 	SubscribePendingLogsEvent(ch chan<- []*types.Log) event.Subscription
 	BloomStatus() (uint64, uint64)
 	ServiceFilter(ctx context.Context, session *bloombits.MatcherSession)
-
-	// Metro GRPC endpoint
-	MetroGRPCEndpoint() string
 }
 
 func GetAPIs(apiBackend Backend) []rpc.API {
diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go
index 77c8919951..24c15b7775 100644
--- a/internal/ethapi/transaction_args_test.go
+++ b/internal/ethapi/transaction_args_test.go
@@ -264,7 +264,6 @@ func (b *backendMock) FeeHistory(ctx context.Context, blockCount uint64, lastBlo
 func (b *backendMock) ChainDb() ethdb.Database           { return nil }
 func (b *backendMock) AccountManager() *accounts.Manager { return nil }
 func (b *backendMock) ExtRPCEnabled() bool               { return false }
-func (b *backendMock) MetroGRPCEndpoint() string         { return "" }
 func (b *backendMock) RPCGasCap() uint64                 { return 0 }
 func (b *backendMock) RPCEVMTimeout() time.Duration      { return time.Second }
 func (b *backendMock) RPCTxFeeCap() float64              { return 0 }
diff --git a/les/api_backend.go b/les/api_backend.go
index 6b1795eae0..2d1fccd9ad 100644
--- a/les/api_backend.go
+++ b/les/api_backend.go
@@ -19,7 +19,6 @@ package les
 import (
 	"context"
 	"errors"
-	"fmt"
 	"math/big"
 	"time"
 
@@ -293,10 +292,6 @@ func (b *LesApiBackend) UnprotectedAllowed() bool {
 	return b.allowUnprotectedTxs
 }
 
-func (b *LesApiBackend) MetroGRPCEndpoint() string {
-	return fmt.Sprintf("%s:%d", b.eth.config.MetroGRPCHost, b.eth.config.MetroGRPCPort)
-}
-
 func (b *LesApiBackend) RPCGasCap() uint64 {
 	return b.eth.config.RPCGasCap
 }