Merge pull request #137 from s7techlab/proto-to-block

proto-to-block

Makefile

@@ -1,6 +1,6 @@
 GOFLAGS ?= -mod=vendor
 
-PROTO_PACKAGES_GO := proto
+PROTO_PACKAGES_GO := block
 PROTO_PACKAGES_SVC := service
 
 test:
@@ -10,6 +10,7 @@ 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
+	@go fmt ./...
 
 clean:
 	@for pkg in $(PROTO_PACKAGES_GO); do find $$pkg \( -name '*.pb.go' -or -name '*.pb.md' \) -delete;done

api/peer_deliver.go

@@ -11,15 +11,15 @@ import (
 	"github.com/hyperledger/fabric-protos-go/peer"
 	"google.golang.org/grpc/codes"
 
-	"github.com/s7techlab/hlf-sdk-go/proto"
+	"github.com/s7techlab/hlf-sdk-go/block"
 )
 
 var (
 	SeekFromOldest = &orderer.SeekPosition{
 		Type: &orderer.SeekPosition_Oldest{Oldest: &orderer.SeekOldest{}}}
 	SeekFromNewest = &orderer.SeekPosition{
 		Type: &orderer.SeekPosition_Newest{Newest: &orderer.SeekNewest{}}}
-	SeekToMax = proto.NewSeekSpecified(math.MaxUint64)
+	SeekToMax = block.NewSeekSpecified(math.MaxUint64)
 )
 
 type DeliverClient interface {
@@ -61,10 +61,10 @@ func SeekRange(start, end uint64) EventCCSeekOption {
 	if start == 0 {
 		seekFrom = SeekFromOldest
 	} else {
-		seekFrom = proto.NewSeekSpecified(start)
+		seekFrom = block.NewSeekSpecified(start)
 	}
 	return func() (*orderer.SeekPosition, *orderer.SeekPosition) {
-		return seekFrom, proto.NewSeekSpecified(end)
+		return seekFrom, block.NewSeekSpecified(end)
 	}
 }
 

proto/block.go → block/block.go

@@ -1,19 +1,17 @@
-package proto
+package block
 
 import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/hyperledger/fabric-protos-go/common"
 	"github.com/hyperledger/fabric-protos-go/msp"
 	"github.com/hyperledger/fabric-protos-go/orderer"
-	"github.com/hyperledger/fabric-protos-go/peer"
 	"github.com/hyperledger/fabric/protoutil"
 
-	bft "github.com/s7techlab/hlf-sdk-go/proto/smartbft"
-	bftcommon "github.com/s7techlab/hlf-sdk-go/proto/smartbft/common"
-	"github.com/s7techlab/hlf-sdk-go/proto/txflags"
+	bft "github.com/s7techlab/hlf-sdk-go/block/smartbft"
+	bftcommon "github.com/s7techlab/hlf-sdk-go/block/smartbft/common"
+	"github.com/s7techlab/hlf-sdk-go/block/txflags"
 )
 
 type (
@@ -177,28 +175,3 @@ func createConfigEnvelope(data []byte) (*common.ConfigEnvelope, error) {
 
 	return configEnvelope, nil
 }
-
-func (x *Block) ValidEnvelopes() []*Envelope {
-	var envs []*Envelope
-	for _, e := range x.Data.Envelopes {
-		if e.ValidationCode != peer.TxValidationCode_VALID {
-			continue
-		}
-
-		envs = append(envs, e)
-	}
-
-	return envs
-}
-
-func (x *Block) BlockDate() *timestamp.Timestamp {
-	var max *timestamp.Timestamp
-	for _, envelope := range x.ValidEnvelopes() {
-		ts := envelope.GetPayload().GetHeader().GetChannelHeader().GetTimestamp()
-
-		if ts.AsTime().After(max.AsTime()) {
-			max = ts
-		}
-	}
-	return max
-}