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

bstasyszyn · bstasyszyn · commit f08071e1cb43 · 2017-09-26T13:17:00.000-04:00
Move order and ledger protos from internal to
third_party to make them available to applications
importing the SDK.

Also, add signed_cc_dep_spec.pb.go to third_party.

Change-Id: I881c4370c613861767101396c03ebbe41a64a405
Signed-off-by: Bob Stasyszyn &lt;bob.stasyszyn@securekey.com&gt;
diff --git a/internal/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil/rwset_proto_util.go b/internal/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil/rwset_proto_util.go
@@ -20,8 +20,8 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/version"
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/core/ledger/util"
-	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/ledger/rwset"
-	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
+	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/ledger/rwset"
+	"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
 )
 
 /////////////////////////////////////////////////////////////////
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/channel/config.go b/pkg/fabric-client/channel/config.go
@@ -14,10 +14,10 @@ import (
 	channelConfig "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/channelconfig"
 	"github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/msp"
 
-	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"
 	mb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/msp"
+	ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 
 	fab "github.com/hyperledger/fabric-sdk-go/api/apifabclient"
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/mocks/mockdata.go b/pkg/fabric-client/mocks/mockdata.go
@@ -12,9 +12,9 @@ import (
 	"github.com/golang/protobuf/proto"
 	channelConfig "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/common/channelconfig"
 	ledger_util "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/core/ledger/util"
-	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"
 	mb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/msp"
+	ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"
 	pp "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 )
 
diff --git a/pkg/fabric-client/mocks/mockendorserserver.go b/pkg/fabric-client/mocks/mockendorserserver.go
@@ -11,7 +11,7 @@ import (
 	"golang.org/x/net/context"
 
 	rwsetutil "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
-	kvrwset "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
+	kvrwset "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
 
 	pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"
 )
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
@@ -18,6 +18,10 @@ declare -a PKGS=(
     "protos/peer"
 
     "protos/msp"
+
+    "protos/ledger/rwset"
+    "protos/ledger/rwset/kvrwset"
+    "protos/orderer"
 )
 
 declare -a FILES=(
@@ -36,10 +40,17 @@ declare -a FILES=(
     "protos/peer/proposal_response.pb.go"
     "protos/peer/query.pb.go"
     "protos/peer/transaction.pb.go"
+    "protos/peer/signed_cc_dep_spec.pb.go"
 
     "protos/msp/identities.pb.go"
     "protos/msp/msp_config.pb.go"
     "protos/msp/msp_principal.pb.go"
+
+    "protos/ledger/rwset/rwset.pb.go"
+    "protos/ledger/rwset/kvrwset/kv_rwset.pb.go"
+
+    "protos/orderer/ab.pb.go"
+    "protos/orderer/configuration.pb.go"
 )
 
 echo 'Removing current upstream project from working directory ...'
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,19 +15,9 @@ GOIMPORTS_CMD=goimports
 
 declare -a PKGS=(
     "protos/utils"
-
-    "protos/ledger/rwset"
-    "protos/ledger/rwset/kvrwset"
-    "protos/orderer"
 )
 
 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"
-
     "protos/utils/commonutils.go"
     "protos/utils/proputils.go"
     "protos/utils/txutils.go"
diff --git a/scripts/third_party_pins/fabric/apply_upstream.sh b/scripts/third_party_pins/fabric/apply_upstream.sh
@@ -51,6 +51,8 @@ declare -a CLIENT_UTILS_IMPORT_SUBSTS=(
     's/\"github.com\/hyperledger\/fabric\/protos\/common/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/common/g'
     's/\"github.com\/hyperledger\/fabric\/protos\/peer/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/peer/g'
     's/\"github.com\/hyperledger\/fabric\/protos\/msp/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/msp/g'
+    's/\"github.com\/hyperledger\/fabric\/protos\/orderer/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/orderer/g'
+    's/\"github.com\/hyperledger\/fabric\/protos\/ledger/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/ledger/g'
     's/\"github.com\/hyperledger\/fabric\/protos/\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\/protos/g'
     's/\"github.com\/hyperledger\/fabric\//\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\//g'
 )
@@ -91,6 +93,8 @@ declare -a PROTOS_INTERNAL_IMPORT_SUBSTS=(
     's/\"github.com\/hyperledger\/fabric\/protos\/common/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/common/g'
     's/\"github.com\/hyperledger\/fabric\/protos\/peer/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/peer/g'
     's/\"github.com\/hyperledger\/fabric\/protos\/msp/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/msp/g'
+    's/\"github.com\/hyperledger\/fabric\/protos\/orderer/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/orderer/g'
+    's/\"github.com\/hyperledger\/fabric\/protos\/ledger/\"github.com\/hyperledger\/fabric-sdk-go\/third_party\/github.com\/hyperledger\/fabric\/protos\/ledger/g'
     's/\"github.com\/hyperledger\/fabric\/protos/\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\/protos/g'
     's/\"github.com\/hyperledger\/fabric\//\"github.com\/hyperledger\/fabric-sdk-go\/internal\/github.com\/hyperledger\/fabric\//g'
 )
diff --git a/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset/kv_rwset.pb.go b/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset/kv_rwset.pb.go
diff --git a/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/rwset.pb.go b/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/rwset.pb.go
diff --git a/third_party/github.com/hyperledger/fabric/protos/orderer/ab.pb.go b/third_party/github.com/hyperledger/fabric/protos/orderer/ab.pb.go
diff --git a/third_party/github.com/hyperledger/fabric/protos/orderer/configuration.pb.go b/third_party/github.com/hyperledger/fabric/protos/orderer/configuration.pb.go
diff --git a/third_party/github.com/hyperledger/fabric/protos/peer/signed_cc_dep_spec.pb.go b/third_party/github.com/hyperledger/fabric/protos/peer/signed_cc_dep_spec.pb.go

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ package mocks`
`9`	`9`	`import (`
`10`	`10`	`"io"`
`11`	`11`
`12`		`- po "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"`
`13`	`12`	`"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"`
	`13`	`+ po "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// TestBlock is a test block`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"golang.org/x/net/context"`
`12`	`12`
`13`	`13`	`rwsetutil "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"`
`14`		`- kvrwset "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"`
	`14`	`+ kvrwset "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"`
`15`	`15`
`16`	`16`	`pb "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/peer"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ import (`
`18`	`18`
`19`	`19`	`"strings"`
`20`	`20`
`21`		`- ab "github.com/hyperledger/fabric-sdk-go/internal/github.com/hyperledger/fabric/protos/orderer"`
`22`	`21`	`"github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/common"`
	`22`	`+ ab "github.com/hyperledger/fabric-sdk-go/third_party/github.com/hyperledger/fabric/protos/orderer"`
`23`	`23`	`"google.golang.org/grpc"`
`24`	`24`	`)`
`25`	`25`