lint clean up

smartcontractkit · Dec 19, 2024 · c39301a · c39301a
1 parent d092f2e
commit c39301a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/go.md b/go.md
@@ -122,6 +122,8 @@ flowchart LR
 	click chainlink-solana href "https://github.com/smartcontractkit/chainlink-solana"
 	chainlink-starknet/relayer --> chainlink-common
 	click chainlink-starknet/relayer href "https://github.com/smartcontractkit/chainlink-starknet"
+	chainlink-testing-framework/framework
+	click chainlink-testing-framework/framework href "https://github.com/smartcontractkit/chainlink-testing-framework"
 	chainlink-testing-framework/havoc --> chainlink-testing-framework/lib/grafana
 	click chainlink-testing-framework/havoc href "https://github.com/smartcontractkit/chainlink-testing-framework"
 	chainlink-testing-framework/lib --> chainlink-testing-framework/seth
@@ -140,6 +142,7 @@ flowchart LR
 	chainlink/deployment --> chainlink-testing-framework/lib
 	chainlink/deployment --> chainlink/v2
 	click chainlink/deployment href "https://github.com/smartcontractkit/chainlink"
+	chainlink/integration-tests --> chainlink-testing-framework/framework
 	chainlink/integration-tests --> chainlink-testing-framework/havoc
 	chainlink/integration-tests --> chainlink/deployment
 	click chainlink/integration-tests href "https://github.com/smartcontractkit/chainlink"
@@ -185,6 +188,7 @@ flowchart LR
 	click chainlink-protos-repo href "https://github.com/smartcontractkit/chainlink-protos"
 
 	subgraph chainlink-testing-framework-repo[chainlink-testing-framework]
+		 chainlink-testing-framework/framework
 		 chainlink-testing-framework/havoc
 		 chainlink-testing-framework/lib
 		 chainlink-testing-framework/lib/grafana

diff --git a/integration-tests/testsetups/ccip/setup.go b/integration-tests/testsetups/ccip/setup.go
@@ -36,6 +36,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
+const DefaultChainNamePrefix = "chain-"
+
 type NetworkSetup struct {
 	NumberOfNetworks int      `toml:"number_of_networks" validate:"required"`
 	PrivateKeys      []string `toml:"private_keys" validate:"required"`
@@ -251,7 +253,7 @@ func createAnvilDockerNetwork(t *testing.T) (
 		require.NoError(t, err, "failed to create deployer")
 		chainCfg := devenv.ChainConfig{
 			ChainID:     id,
-			ChainName:   "chain-" + chain.ChainID,
+			ChainName:   DefaultChainNamePrefix + chain.ChainID,
 			ChainType:   devenv.EVMChainType,
 			WSRPCs:      []string{chain.Nodes[0].HostWSUrl},
 			HTTPRPCs:    []string{chain.Nodes[0].HostHTTPUrl},
@@ -279,7 +281,6 @@ func startCLNodes(
 	tomlNodeConfig := in.NodeSet.NodeSpecs[0].Node.TestConfigOverrides
 	tomlNodeConfig += getChainSpecificNodeSpec(blockchains)
 	tomlNodeConfig += fmt.Sprintf(`
-
 		# This is needed for external registry
 		[Capabilities]
 		[Capabilities.ExternalRegistry]
@@ -316,8 +317,7 @@ func getChainSpecificNodeSpec(bcs []*blockchain.Output) string {
 				[[EVM.Nodes]]
 				Name = '%s'
 				WSURL = '%s'
-				HTTPURL = '%s'
-				`,
+				HTTPURL = '%s'`,
 				bc.ChainID,
 				"chain-"+bc.ChainID,
 				bc.Nodes[0].DockerInternalWSUrl,
@@ -337,8 +337,7 @@ func getChainSpecificNodeSpec(bcs []*blockchain.Output) string {
 				[[EVM.Nodes]]
 				Name = '%s'
 				WSURL = '%s'
-				HTTPURL = '%s'
-`,
+				HTTPURL = '%s'`,
 				bc.ChainID,
 				"chain-"+bc.ChainID,
 				bc.Nodes[0].DockerInternalWSUrl,