cleanup

Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>

Author: adecaro

Makefile

@@ -153,4 +153,19 @@ clean-fabric-peer-images:
 
 .PHONY: fsccli
 fsccli:
-	@go install ./cmd/fsccli
+	@go install ./cmd/fsccli
+
+.PHONY: lint
+lint:
+	@echo "Running Go Linters..."
+	golangci-lint run --color=always --timeout=4m
+
+.PHONY: lint-auto-fix
+lint-auto-fix:
+	@echo "Running Go Linters with auto-fix..."
+	golangci-lint run --color=always --timeout=4m --fix
+
+.PHONY: install-linter-tool
+install-linter-tool:
+	@echo "Installing golangci Linter"
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(HOME)/go/bin v2.4.0

platform/view/sdk/dig/sdk.go

@@ -16,6 +16,7 @@ import (
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
 	digutils "github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/dig"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/hash"
+	endpoint2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/sdk/dig/support/endpoint"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm/host"
@@ -71,7 +72,7 @@ func NewSDKFrom(baseSDK dig2.SDK, registry services.Registry) *SDK {
 		sdk.Container().Provide(func() *config.Provider { return config.GetProvider(registry) }),
 		sdk.Container().Provide(
 			digutils.Identity[*config.Provider](),
-			dig.As(new(driver.ConfigService), new(id.ConfigProvider), new(endpoint.ConfigService), new(dbdriver.Config)),
+			dig.As(new(driver.ConfigService), new(id.ConfigProvider), new(endpoint2.ConfigService), new(dbdriver.Config)),
 		),
 	)
 	if err != nil {
@@ -105,17 +106,17 @@ func (p *SDK) Install() error {
 		p.Container().Provide(endpoint.NewService),
 		p.Container().Provide(
 			digutils.Identity[*endpoint.Service](),
-			dig.As(new(comm.EndpointService), new(id.EndpointService), new(endpoint.Backend), new(view.EndpointService)),
+			dig.As(new(comm.EndpointService), new(id.EndpointService), new(endpoint2.Backend), new(view.EndpointService)),
 		),
-		p.Container().Provide(endpoint.NewResolversLoader),
+		p.Container().Provide(endpoint2.NewResolversLoader),
 
 		// Identity Service
 		p.Container().Provide(id.NewProvider),
 		p.Container().Provide(newKMSDriver),
 		p.Container().Provide(file.NewDriver, dig.Group("kms-drivers")),
 		p.Container().Provide(
 			digutils.Identity[*id.Provider](),
-			dig.As(new(endpoint.IdentityService), new(server2.IdentityProvider), new(view.IdentityProvider)),
+			dig.As(new(endpoint2.IdentityService), new(server2.IdentityProvider), new(view.IdentityProvider)),
 		),
 
 		// View Manager
@@ -194,7 +195,7 @@ func (p *SDK) Install() error {
 	}
 
 	// Load endpoint service's resolvers
-	if err := p.Container().Invoke(func(resolverService *endpoint.ResolversLoader) error { return resolverService.LoadResolvers() }); err != nil {
+	if err := p.Container().Invoke(func(resolverService *endpoint2.ResolversLoader) error { return resolverService.LoadResolvers() }); err != nil {
 		return err
 	}
 	return nil

…tform/view/services/endpoint/resolver.go …iew/sdk/dig/support/endpoint/resolver.goplatform/view/services/endpoint/resolver.go renamed to platform/view/sdk/dig/support/endpoint/resolver.go platform/view/services/endpoint/resolver.go renamed to platform/view/sdk/dig/support/endpoint/resolver.go

@@ -11,10 +11,15 @@ import (
 	"strings"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/common/services/logging"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/endpoint"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/id"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
+var logger = logging.MustGetLogger()
+
 type Identity struct {
 	Path string `yaml:"path"`
 }
@@ -72,12 +77,17 @@ func NewResolversLoader(config ConfigService, backend Backend, is IdentityServic
 
 func (r *ResolversLoader) LoadResolvers() error {
 	// add default
-	_, err := r.backend.AddResolver(
+	p2pAddress := r.config.GetString("fsc.p2p.listenAddress")
+	address, err := convertAddress(r.config.GetString("fsc.p2p.listenAddress"))
+	if err != nil {
+		return errors.Wrapf(err, "failed to convert address [%s]", p2pAddress)
+	}
+	_, err = r.backend.AddResolver(
 		r.config.GetString("fsc.id"),
 		"",
 		map[string]string{
-			string(ViewPort): r.config.GetString("fsc.grpc.address"),
-			string(P2PPort):  convertAddress(r.config.GetString("fsc.p2p.listenAddress")),
+			string(endpoint.ViewPort): r.config.GetString("fsc.grpc.address"),
+			string(endpoint.P2PPort):  address,
 		},
 		nil,
 		r.is.DefaultIdentity(),
@@ -127,13 +137,14 @@ func (r *ResolversLoader) LoadResolvers() error {
 	return nil
 }
 
-func convertAddress(addr string) string {
-	parts := strings.Split(addr, "/")
-	if len(parts) != 5 {
-		panic("unexpected address found: " + addr)
+func convertAddress(addr string) (string, error) {
+	result, err := comm.ConvertAddress(addr)
+	if err != nil {
+		return "", err
 	}
-	if parts[2] == "0.0.0.0" {
-		parts[2] = "127.0.0.1"
+	if strings.HasPrefix(result, "0.0.0.0") {
+		// change the prefix to 127.0.0.1
+		result = "127.0.0.1" + strings.TrimPrefix(result, "0.0.0.0")
 	}
-	return parts[2] + ":" + parts[4]
+	return result, nil
 }

platform/view/services/comm/host/rest/provider.go

@@ -7,9 +7,8 @@ SPDX-License-Identifier: Apache-2.0
 package rest
 
 import (
-	"strings"
-
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
+	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm"
 	host2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm/host"
 	routing2 "github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm/host/rest/routing"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/id"
@@ -41,13 +40,9 @@ func (p *endpointServiceBasedProvider) GetNewHost() (host2.P2PHost, error) {
 		return nil, errors.Wrapf(err, "failed to load identity in [%s]", p.config.CertPath())
 	}
 	nodeID := string(p.pkiExtractor.ExtractPKI(raw))
-	return NewHost(nodeID, convertAddress(p.config.ListenAddress()), p.routing, p.streamProvider, p.config.ClientTLSConfig(), p.config.ServerTLSConfig()), nil
-}
-
-func convertAddress(addr string) string {
-	parts := strings.Split(addr, "/")
-	if len(parts) != 5 {
-		panic("unexpected address found: " + addr)
+	address, err := comm.ConvertAddress(p.config.ListenAddress())
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to convert address")
 	}
-	return parts[2] + ":" + parts[4]
+	return NewHost(nodeID, address, p.routing, p.streamProvider, p.config.ClientTLSConfig(), p.config.ServerTLSConfig()), nil
 }

platform/view/services/comm/p2p.go

@@ -9,6 +9,7 @@ package comm
 import (
 	"context"
 	"runtime/debug"
+	"strings"
 	"sync"
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
@@ -324,3 +325,13 @@ func (s *streamHandler) close(context.Context) {
 	}
 	s.node.m.ClosedStreams.Add(1)
 }
+
+// ConvertAddress converts an address of the form `/ip4/host/tcp/port` to an address of the form `host:port`.
+// The function returns an error if the input is not in expected format.
+func ConvertAddress(addr string) (string, error) {
+	parts := strings.Split(addr, "/")
+	if len(parts) != 5 {
+		return "", errors.Errorf("unexpected address found [%s]", addr)
+	}
+	return parts[2] + ":" + parts[4], nil
+}

platform/view/services/comm/service.go

@@ -13,13 +13,11 @@ import (
 
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/comm/host"
-	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/endpoint"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/metrics"
 	"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
 )
 
 type EndpointService interface {
-	Resolve(ctx context.Context, party view.Identity) (view.Identity, map[endpoint.PortName]string, []byte, error)
 	GetIdentity(label string, pkID []byte) (view.Identity, error)
 }