Merge pull request #136 from s7techlab/services-refactoring

services refactoring

.generators/deps.go

@@ -6,4 +6,11 @@ package generators
 import (
 	// proto/grpc
 	_ "github.com/golang/protobuf/protoc-gen-go"
+
+	// validation schema
+	_ "github.com/envoyproxy/protoc-gen-validate"
+
+	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway"
+
+	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"
 )

.generators/install.sh

@@ -34,7 +34,8 @@ pwd
 for genpkg in `go list -f '{{ join .Imports "\n" }}' deps.go`
 do
     echo "building $genpkg..."
-    go build -mod=vendor -o ${GENERATOR_DIR}/bin/`basename $genpkg` -trimpath ${genpkg}
+    go get ${genpkg}
+    go build -mod=readonly -o ${GENERATOR_DIR}/bin/`basename $genpkg` -trimpath ${genpkg}
     echo "installed $genpkg"
 done
 

.github/workflows/go.yml

@@ -1,6 +1,6 @@
 name: Go Quality
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   test:
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.16'
+          go-version: '1.18'
 
       - name: Check out code
         uses: actions/checkout@v2

Makefile

@@ -1,13 +1,16 @@
 GOFLAGS ?= -mod=vendor
 
 PROTO_PACKAGES_GO := proto
+PROTO_PACKAGES_SVC := service
 
 test:
 	@echo "go test -mod vendor ./..."
 	@go test ./...
 
 proto: clean
 	@for pkg in $(PROTO_PACKAGES_GO) ;do echo $$pkg && buf generate --template buf.gen.go.yaml $$pkg -o ./$$(echo $$pkg | cut -d "/" -f1); done
+	@for pkg in $(PROTO_PACKAGES_SVC) ;do echo $$pkg && buf generate --template buf.gen.svc.yaml $$pkg -o ./$$(echo $$pkg | cut -d "/" -f1); done
 
 clean:
 	@for pkg in $(PROTO_PACKAGES_GO); do find $$pkg \( -name '*.pb.go' -or -name '*.pb.md' \) -delete;done
+	@for pkg in $(PROTO_PACKAGES_SVC); do find $$pkg \( -name '*.pb.go' -or -name '*.pb.cc.go' -or -name '*.pb.gw.go' -or -name '*.swagger.json' -or -name '*.pb.md' \) -delete;done

api/channel.go

@@ -0,0 +1,19 @@
+package api
+
+import (
+	"context"
+)
+
+type Channel interface {
+	// Chaincode returns chaincode instance by chaincode name
+	Chaincode(ctx context.Context, name string) (Chaincode, error)
+	// Join channel
+	Join(ctx context.Context) error
+}
+
+// types which identify tx "wait'er" policy
+// we don't make it as alias for preventing binding to our lib
+const (
+	TxWaiterSelfType string = "self"
+	TxWaiterAllType  string = "all"
+)

api/public.go → api/client.go

@@ -76,8 +76,10 @@ type Invoker interface {
 	) (res *peer.Response, chaincodeTx string, err error)
 }
 
-type Public interface {
+type Client interface {
 	EventsDeliverer
 	BlocksDeliverer
 	Invoker
+
+	FabricV2() bool
 }

api/config/config.go

@@ -4,10 +4,12 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/s7techlab/hlf-sdk-go/crypto"
 )
 
 type Config struct {
-	Crypto    CryptoConfig       `yaml:"crypto"`
+	Crypto    *crypto.Config     `yaml:"crypto"`
 	Orderers  []ConnectionConfig `yaml:"orderers"`
 	Discovery DiscoveryConfig    `yaml:"discovery"`
 	// peer pool for local configuration without gossip discovery
@@ -25,9 +27,9 @@ type ConnectionConfig struct {
 }
 
 type CAConfig struct {
-	Crypto CryptoConfig `yaml:"crypto"`
-	Host   string       `yaml:"host"`
-	Tls    TlsConfig    `yaml:"tls"`
+	Crypto *crypto.Config `yaml:"crypto"`
+	Host   string         `yaml:"host"`
+	Tls    TlsConfig      `yaml:"tls"`
 }
 
 type PoolConfig struct {
@@ -99,13 +101,6 @@ type DiscoveryChaincode struct {
 	Policy  string `json:"policy"`
 }
 
-type CryptoConfig struct {
-	Type    string          `yaml:"type"`
-	Options CryptoSuiteOpts `yaml:"options"`
-}
-
-type CryptoSuiteOpts map[string]interface{}
-
 type Duration struct {
 	time.Duration
 }

api/peer.go

@@ -15,11 +15,11 @@ type Endorser interface {
 	Endorse(ctx context.Context, proposal *peer.SignedProposal) (*peer.ProposalResponse, error)
 }
 
-type ChannelsFetcher interface {
+type ChannelListGetter interface {
 	GetChannels(ctx context.Context) (*peer.ChannelQueryResponse, error)
 }
 
-type ChannelInfo interface {
+type ChainInfoGetter interface {
 	GetChainInfo(ctx context.Context, channel string) (*common.BlockchainInfo, error)
 }
 
@@ -29,9 +29,9 @@ type Peer interface {
 
 	Endorser
 
-	ChannelInfo
+	ChannelListGetter
 
-	ChannelsFetcher
+	ChainInfoGetter
 
 	BlocksDeliverer
 

api/peer_pool.go

@@ -2,30 +2,11 @@ package api
 
 import (
 	"context"
-	"fmt"
-	"time"
 
 	"github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/msp"
-	"google.golang.org/grpc/connectivity"
 )
 
-const (
-	ErrNoPeersForMSP = Error(`no peers for MSP`)
-	ErrMSPNotFound   = Error(`MSP not found`)
-	ErrPeerNotReady  = Error(`peer not ready`)
-
-	DefaultGrpcCheckPeriod = 5 * time.Second
-)
-
-type ErrNoReadyPeers struct {
-	MspId string
-}
-
-func (e ErrNoReadyPeers) Error() string {
-	return fmt.Sprintf("no ready peers for MspId: %s", e.MspId)
-}
-
 type MSPPeerPool interface {
 	Peers() []Peer
 	FirstReadyPeer() (Peer, error)
@@ -45,21 +26,3 @@ type PeerPool interface {
 }
 
 type PeerPoolCheckStrategy func(ctx context.Context, peer Peer, alive chan bool)
-
-func StrategyGRPC(d time.Duration) PeerPoolCheckStrategy {
-	return func(ctx context.Context, peer Peer, alive chan bool) {
-		t := time.NewTicker(d)
-		for {
-			select {
-			case <-ctx.Done():
-				return
-			case <-t.C:
-				if peer.Conn().GetState() == connectivity.Ready {
-					alive <- true
-				} else {
-					alive <- false
-				}
-			}
-		}
-	}
-}

buf.gen.go.yaml

@@ -6,4 +6,12 @@ plugins:
     path: .generators/bin/protoc-gen-go
     out: .
     opt:
+      - plugins=grpc
       - paths=source_relative
+
+  - name: go-validate
+    path: .generators/bin/protoc-gen-validate
+    out: .
+    opt:
+      - paths=source_relative
+      - lang=go

buf.gen.svc.yaml

@@ -0,0 +1,30 @@
+version: v1
+
+plugins:
+
+  - name: go
+    path: .generators/bin/protoc-gen-go
+    out: .
+    opt:
+      - plugins=grpc
+      - paths=source_relative
+
+  - name: go-validate
+    path: .generators/bin/protoc-gen-validate
+    out: .
+    opt:
+      - paths=source_relative
+      - lang=go
+
+  - name: swagger
+    path: .generators/bin/protoc-gen-swagger
+    out: .
+    opt:
+      - logtostderr=true
+
+  - name: grpc-gateway
+    path: .generators/bin/protoc-gen-grpc-gateway
+    out: .
+    opt:
+      - logtostderr=true
+      - paths=source_relative