From 5496007cbafb31310cbf622c0b39af80b5e50eeb Mon Sep 17 00:00:00 2001
From: Alex <dalexwatts@gmail.com>
Date: Tue, 7 Feb 2023 20:43:03 -0800
Subject: [PATCH] updated type conversion point to simplify - tested flag and
 no-flag (default) settings

---
 cmd/utils/flags.go            | 4 ++--
 eth/backend.go                | 2 +-
 internal/cli/server/config.go | 2 +-
 p2p/server.go                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 318a98e017..3c3220ddc4 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -758,7 +758,7 @@ var (
 	TxArrivalWaitFlag = cli.IntFlag{
 		Name:  "txarrivalwait",
 		Usage: "Maximum number of milliseconds to wait for a transaction before requesting it (defaults to 100ms)",
-		Value: (int)(node.DefaultConfig.P2P.TxArrivalWait),
+		Value: node.DefaultConfig.P2P.TxArrivalWait,
 	}
 
 	// Metrics flags
@@ -1296,7 +1296,7 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
 	}
 
 	if ctx.GlobalIsSet(TxArrivalWaitFlag.Name) {
-		cfg.TxArrivalWait = (time.Duration)(TxArrivalWaitFlag.Value) * time.Millisecond
+		cfg.TxArrivalWait = TxArrivalWaitFlag.Value
 	}
 }
 
diff --git a/eth/backend.go b/eth/backend.go
index ad00cfacd2..c98b31966d 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -266,7 +266,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		EthAPI:             ethAPI,
 		PeerRequiredBlocks: config.PeerRequiredBlocks,
 		checker:            checker,
-		txArrivalWait:      eth.p2pServer.TxArrivalWait,
+		txArrivalWait:      time.Duration(eth.p2pServer.TxArrivalWait) * time.Millisecond,
 	}); err != nil {
 		return nil, err
 	}
diff --git a/internal/cli/server/config.go b/internal/cli/server/config.go
index f75ca56a21..79c4acf7ec 100644
--- a/internal/cli/server/config.go
+++ b/internal/cli/server/config.go
@@ -1051,7 +1051,7 @@ func (c *Config) buildNode() (*node.Config, error) {
 			MaxPendingPeers: int(c.P2P.MaxPendPeers),
 			ListenAddr:      c.P2P.Bind + ":" + strconv.Itoa(int(c.P2P.Port)),
 			DiscoveryV5:     c.P2P.Discovery.V5Enabled,
-			TxArrivalWait:   time.Duration(c.P2P.TxArrivalWait),
+			TxArrivalWait:   int(c.P2P.TxArrivalWait),
 		},
 		HTTPModules:         c.JsonRPC.Http.API,
 		HTTPCors:            c.JsonRPC.Http.Cors,
diff --git a/p2p/server.go b/p2p/server.go
index c51ba3f5b7..0f9285b01a 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -159,7 +159,7 @@ type Config struct {
 
 	// TxArrivalWait is the duration (ms) that the node will wait after seeing
 	// an announced transaction before explicitly requesting it
-	TxArrivalWait time.Duration
+	TxArrivalWait int
 }
 
 // Server manages all peer connections.