switch p2p, remove external p2p url

Author: skudasov

framework/components/clnode/clnode.go

@@ -66,7 +66,6 @@ type NodeOut struct {
 	APIAuthPassword string `toml:"api_auth_password"`
 	ContainerName   string `toml:"container_name"`
 	HostURL         string `toml:"url"`
-	HostP2PURL      string `toml:"p2p_url"`
 	DockerURL       string `toml:"docker_internal_url"`
 	DockerP2PUrl    string `toml:"p2p_docker_internal_url"`
 }
@@ -122,7 +121,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 	if err != nil {
 		return nil, err
 	}
-	cfgPath, err := writeDefaultConfig(in)
+	cfgPath, err := writeDefaultConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -148,7 +147,6 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 	}
 
 	httpPort := fmt.Sprintf("%s/tcp", DefaultHTTPPort)
-	p2pPort := fmt.Sprintf("%s/tcp", DefaultP2PPort)
 	var containerName string
 	if in.Node.Name != "" {
 		containerName = in.Node.Name
@@ -159,7 +157,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 	for _, p := range in.Node.CustomPorts {
 		customPorts = append(customPorts, fmt.Sprintf("%d/tcp", p))
 	}
-	exposedPorts := []string{httpPort, p2pPort}
+	exposedPorts := []string{httpPort}
 	exposedPorts = append(exposedPorts, customPorts...)
 
 	portBindings := nat.PortMap{
@@ -169,12 +167,6 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 				HostPort: fmt.Sprintf("%d/tcp", in.Node.HTTPPort),
 			},
 		},
-		nat.Port(p2pPort): []nat.PortBinding{
-			{
-				HostIP:   "0.0.0.0",
-				HostPort: fmt.Sprintf("%d/udp", in.Node.P2PPort),
-			},
-		},
 	}
 	for _, p := range customPorts {
 		portBindings[nat.Port(p)] = []nat.PortBinding{
@@ -284,14 +276,12 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 	}
 
 	mp := nat.Port(fmt.Sprintf("%d/tcp", in.Node.HTTPPort))
-	mpP2P := nat.Port(fmt.Sprintf("%d/udp", in.Node.P2PPort))
 
 	return &NodeOut{
 		APIAuthUser:     DefaultAPIUser,
 		APIAuthPassword: DefaultAPIPassword,
 		ContainerName:   containerName,
 		HostURL:         fmt.Sprintf("http://%s:%s", host, mp.Port()),
-		HostP2PURL:      fmt.Sprintf("http://%s:%s", host, mpP2P.Port()),
 		DockerURL:       fmt.Sprintf("http://%s:%s", containerName, DefaultHTTPPort),
 		DockerP2PUrl:    fmt.Sprintf("http://%s:%s", containerName, DefaultP2PPort),
 	}, nil
@@ -302,7 +292,7 @@ type DefaultCLNodeConfig struct {
 	SecureCookies bool
 }
 
-func generateDefaultConfig(in *Input) (string, error) {
+func generateDefaultConfig() (string, error) {
 	config := DefaultCLNodeConfig{
 		HTTPPort:      DefaultHTTPPort,
 		SecureCookies: false,
@@ -350,8 +340,8 @@ func writeDefaultSecrets(pgOut *postgres.Output) (*os.File, error) {
 	return WriteTmpFile(secretsOverrides, "secrets.toml")
 }
 
-func writeDefaultConfig(in *Input) (*os.File, error) {
-	cfg, err := generateDefaultConfig(in)
+func writeDefaultConfig() (*os.File, error) {
+	cfg, err := generateDefaultConfig()
 	if err != nil {
 		return nil, err
 	}