[FAB-6300] - Move orderer and ledger to third_party

Move ab.pb.go back to internal since these protos shouldn't be exposed. Change-Id: Ic613a709f039867069e27d5ac0e8928832ad626c Signed-off-by: Bob Stasyszyn <bob.stasyszyn@securekey.com>
hyperledger · Sep 26, 2017 · 293fb2b · 293fb2b
1 parent 53d86b1
commit 293fb2b
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 6 deletions.
diff --git a/...yperledger/fabric/protos/orderer/ab.pb.go → ...yperledger/fabric/protos/orderer/ab.pb.go b/...yperledger/fabric/protos/orderer/ab.pb.go → ...yperledger/fabric/protos/orderer/ab.pb.go
diff --git a/pkg/fabric-client/channel/block.go b/pkg/fabric-client/channel/block.go
@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto"
+	ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
 	protos_utils "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/utils"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
-	ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	fc "github.com/hyperledger/fabric-sdk-go/pkg/fabric-client/internal"

diff --git a/pkg/fabric-client/internal/util.go b/pkg/fabric-client/internal/util.go
@@ -9,8 +9,8 @@ package internal
 import (
 	"fmt"
 
+	ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/bccsp"
-	ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/crypto"

diff --git a/pkg/fabric-client/mocks/mockbroadcastserver.go b/pkg/fabric-client/mocks/mockbroadcastserver.go
@@ -9,8 +9,8 @@ package mocks
 import (
 	"io"
 
+	po "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
-	po "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 )
 
 // TestBlock is a test block

diff --git a/pkg/fabric-client/orderer/orderer.go b/pkg/fabric-client/orderer/orderer.go
@@ -13,8 +13,8 @@ import (
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
 	"google.golang.org/grpc/credentials"
 
+	ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
-	ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 	"github.com/op/go-logging"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"

diff --git a/pkg/fabric-client/orderer/orderer_test.go b/pkg/fabric-client/orderer/orderer_test.go
@@ -18,8 +18,8 @@ import (
 
 	"strings"
 
+	ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"
 	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"
-	ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 	"google.golang.org/grpc"
 )
 

diff --git a/scripts/third_party_pins/fabric/apply_fabric_protos.sh b/scripts/third_party_pins/fabric/apply_fabric_protos.sh
@@ -49,7 +49,6 @@ declare -a FILES=(
     "protos/ledger/rwset/rwset.pb.go"
     "protos/ledger/rwset/kvrwset/kv_rwset.pb.go"
 
-    "protos/orderer/ab.pb.go"
     "protos/orderer/configuration.pb.go"
 )
 

diff --git a/scripts/third_party_pins/fabric/apply_fabric_protos_internal.sh b/scripts/third_party_pins/fabric/apply_fabric_protos_internal.sh
@@ -15,12 +15,14 @@ GOIMPORTS_CMD=goimports
 
 declare -a PKGS=(
     "protos/utils"
+    "protos/orderer"
 )
 
 declare -a FILES=(
     "protos/utils/commonutils.go"
     "protos/utils/proputils.go"
     "protos/utils/txutils.go"
+    "protos/orderer/ab.pb.go"
 )
 
 #echo 'Removing current upstream project from working directory ...'