FAB-1035 move peer specific proto files to peer folder

https://jira.hyperledger.org/browse/FAB-1035

Just a reorg of the files in keeping with creation of
"common" and "orderer" package files with corresponding
import changes.

A final cleanup of removing unused messages and renaming
"2" suffixed protos needs to be done as a final cleanup

Change-Id: I81cfa970ca5b4ff668dd70247117bd4e34548ad5
Signed-off-by: Srinivasan Muralidharan <muralisr@us.ibm.com>

Author: Srinivasan Muralidharan

bddtests/chaincode.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/util"
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 	putils "github.com/hyperledger/fabric/protos/utils"
 )
 

bddtests/endorser_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/DATA-DOG/godog"
 	"github.com/DATA-DOG/godog/gherkin"
 	"github.com/hyperledger/fabric/core/util"
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )

bddtests/syschaincode/noop/chaincode.go

@@ -21,13 +21,14 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
-	"github.com/hyperledger/fabric/protos"
+
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 var logger = shim.NewLogger("noop")
 
 type ledgerHandler interface {
-	GetTransactionByID(txID string) (*protos.Transaction, error)
+	GetTransactionByID(txID string) (*pb.Transaction, error)
 }
 
 // SystemChaincode is type representing the chaincode
@@ -78,7 +79,7 @@ func (t *SystemChaincode) Query(stub shim.ChaincodeStubInterface) ([]byte, error
 		if nil != txerr || nil == tx {
 			return nil, txerr
 		}
-		newCCIS := &protos.ChaincodeInvocationSpec{}
+		newCCIS := &pb.ChaincodeInvocationSpec{}
 		var merr = proto.Unmarshal(tx.Payload, newCCIS)
 		if nil != merr {
 			return nil, merr

bddtests/syschaincode/noop/chaincode_test.go

@@ -23,7 +23,8 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/util"
-	"github.com/hyperledger/fabric/protos"
+
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 var something = "c29tZXRoaW5n"
@@ -122,11 +123,11 @@ func TestQueryGetTranExisting(t *testing.T) {
 type mockLedger struct {
 }
 
-func (ml mockLedger) GetTransactionByID(txID string) (*protos.Transaction, error) {
+func (ml mockLedger) GetTransactionByID(txID string) (*pb.Transaction, error) {
 	if txID == "noSuchTX" {
 		return nil, fmt.Errorf("Some error")
 	}
-	newCCIS := &protos.ChaincodeInvocationSpec{ChaincodeSpec: &protos.ChaincodeSpec{CtorMsg: &protos.ChaincodeInput{Args: util.ToChaincodeArgs("execute", something)}}}
+	newCCIS := &pb.ChaincodeInvocationSpec{ChaincodeSpec: &pb.ChaincodeSpec{CtorMsg: &pb.ChaincodeInput{Args: util.ToChaincodeArgs("execute", something)}}}
 	pl, _ := proto.Marshal(newCCIS)
-	return &protos.Transaction{Payload: pl}, nil
+	return &pb.Transaction{Payload: pl}, nil
 }

bddtests/users.go

@@ -19,7 +19,7 @@ package bddtests
 import (
 	"fmt"
 
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 // UserRegistration represents a user in the peer network

bddtests/util.go

@@ -17,7 +17,7 @@ limitations under the License.
 package bddtests
 
 import (
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 // KeyedProposalResponse the response for an endorsement for internal usage in maps

core/admin.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/hyperledger/fabric/flogging"
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 var log = logging.MustGetLogger("server")

core/chaincode/chaincode_support.go

@@ -36,7 +36,7 @@ import (
 	"github.com/hyperledger/fabric/core/crypto"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/flogging"
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 // ChainName is the name of the chain to which this chaincode support belongs to.

core/chaincode/chaincodeexec.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/hyperledger/fabric/core/util"
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 //create a Transactions - this has to change to Proposal when we move chaincode to use Proposals

core/chaincode/exectransaction.go

@@ -24,7 +24,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/hyperledger/fabric/events/producer"
-	pb "github.com/hyperledger/fabric/protos"
+	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 //Execute - execute transaction or a query