[FAB-3313] Move APIs to appropriate class

Change-Id: I75b8656055a8e2ee935d083e279d2a6ee8923639
Signed-off-by: biljana lukovic <biljana.lukovic@securekey.com>

Author: biljanaLukovic

fabric-client/chain.go

@@ -33,7 +33,6 @@ import (
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 
-	google_protobuf "github.com/golang/protobuf/ptypes/timestamp"
 	protos_utils "github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"
 
@@ -78,15 +77,12 @@ type Chain interface {
 	QueryBlock(blockNumber int) (*common.Block, error)
 	QueryBlockByHash(blockHash []byte) (*common.Block, error)
 	QueryTransaction(transactionID string) (*pb.ProcessedTransaction, error)
-	QueryInstalledChaincodes(peer Peer) (*pb.ChaincodeQueryResponse, error)
 	QueryInstantiatedChaincodes() (*pb.ChaincodeQueryResponse, error)
-	QueryChannels(peer Peer) (*pb.ChannelQueryResponse, error)
 	QueryByChaincode(chaincodeName string, args []string, targets []Peer) ([][]byte, error)
 	CreateTransactionProposal(chaincodeName string, chainID string, args []string, sign bool, transientData map[string][]byte) (*TransactionProposal, error)
 	SendTransactionProposal(proposal *TransactionProposal, retry int, targets []Peer) ([]*TransactionProposalResponse, error)
 	CreateTransaction(resps []*TransactionProposalResponse) (*Transaction, error)
 	SendTransaction(tx *Transaction) ([]*TransactionResponse, error)
-	SendInstallProposal(chaincodeName string, chaincodePath string, chaincodeVersion string, chaincodePackage []byte, targets []Peer) ([]*TransactionProposalResponse, string, error)
 	SendInstantiateProposal(chaincodeName string, chainID string, args []string, chaincodePath string, chaincodeVersion string, targets []Peer) ([]*TransactionProposalResponse, string, error)
 	GetOrganizationUnits() ([]string, error)
 	QueryExtensionInterface() ChainExtension
@@ -523,8 +519,8 @@ func (c *chain) JoinChannel(request *JoinChannelRequest) error {
 		return err
 	}
 	// Sign join proposal
-	signature, err := c.signObjectWithKey(proposalBytes, user.GetPrivateKey(),
-		&bccsp.SHAOpts{}, nil)
+	signature, err := signObjectWithKey(proposalBytes, user.GetPrivateKey(),
+		&bccsp.SHAOpts{}, nil, c.clientContext.GetCryptoSuite())
 	if err != nil {
 		return err
 	}
@@ -701,30 +697,6 @@ func (c *chain) QueryTransaction(transactionID string) (*pb.ProcessedTransaction
 	return transaction, nil
 }
 
-//QueryInstalledChaincodes
-/**
- * Queries the installed chaincodes on a peer
- * Returning the details of all chaincodes installed on a peer.
- * @param {Peer} peer
- * @returns {object} ChaincodeQueryResponse proto
- */
-
-func (c *chain) QueryInstalledChaincodes(peer Peer) (*pb.ChaincodeQueryResponse, error) {
-
-	payload, err := c.queryByChaincodeByTarget("lccc", []string{"getinstalledchaincodes"}, peer)
-	if err != nil {
-		return nil, fmt.Errorf("Invoke lccc getinstalledchaincodes return error: %v", err)
-	}
-
-	response := new(pb.ChaincodeQueryResponse)
-	err = proto.Unmarshal(payload, response)
-	if err != nil {
-		return nil, fmt.Errorf("Unmarshal ChaincodeQueryResponse return error: %v", err)
-	}
-
-	return response, nil
-}
-
 //QueryInstantiatedChaincodes
 /**
  * Queries the instantiated chaincodes on this channel.
@@ -747,30 +719,6 @@ func (c *chain) QueryInstantiatedChaincodes() (*pb.ChaincodeQueryResponse, error
 	return response, nil
 }
 
-//QueryChannels
-/**
- * Queries the names of all the channels that a
- * peer has joined.
- * @param {Peer} peer
- * @returns {object} ChannelQueryResponse proto
- */
-
-func (c *chain) QueryChannels(peer Peer) (*pb.ChannelQueryResponse, error) {
-
-	payload, err := c.queryByChaincodeByTarget("cscc", []string{"GetChannels"}, peer)
-	if err != nil {
-		return nil, fmt.Errorf("Invoke cscc GetChannels return error: %v", err)
-	}
-
-	response := new(pb.ChannelQueryResponse)
-	err = proto.Unmarshal(payload, response)
-	if err != nil {
-		return nil, fmt.Errorf("Unmarshal ChannelQueryResponse return error: %v", err)
-	}
-
-	return response, nil
-}
-
 /**
  * Generic helper for query functionality for chain
  * This query will be made to one target peer and will return one result only.
@@ -795,7 +743,7 @@ func (c *chain) queryByChaincodeByTarget(chaincodeName string, args []string, ta
 
 }
 
-//QueryByChaincode
+//QueryByChaincode ..
 /**
 * Sends a proposal to one or more endorsing peers that will be handled by the chaincode.
 * This request will be presented to the chaincode 'invoke' and must understand
@@ -807,8 +755,7 @@ func (c *chain) queryByChaincodeByTarget(chaincodeName string, args []string, ta
  * @param {[]Peer} target peers
  * @returns {[][]byte} an array of payloads
 */
-func (c *chain) QueryByChaincode(chaincodeName string, args []string, targets []Peer) ([][]byte, error) {
-
+func QueryByChaincode(chaincodeName string, args []string, targets []Peer, clientContext Client) ([][]byte, error) {
 	if chaincodeName == "" {
 		return nil, fmt.Errorf("Missing chaincode name")
 	}
@@ -823,12 +770,12 @@ func (c *chain) QueryByChaincode(chaincodeName string, args []string, targets []
 
 	logger.Debugf("Calling %s function %v on targets: %s\n", chaincodeName, args[0], targets)
 
-	signedProposal, err := c.CreateTransactionProposal(chaincodeName, "", args, true, nil)
+	signedProposal, err := CreateTransactionProposal(chaincodeName, "", args, true, nil, clientContext)
 	if err != nil {
 		return nil, fmt.Errorf("CreateTransactionProposal return error: %v", err)
 	}
 
-	transactionProposalResponses, err := c.SendTransactionProposal(signedProposal, 0, targets)
+	transactionProposalResponses, err := SendTransactionProposal(signedProposal, 0, targets)
 	if err != nil {
 		return nil, fmt.Errorf("SendTransactionProposal return error: %v", err)
 	}
@@ -850,6 +797,10 @@ func (c *chain) QueryByChaincode(chaincodeName string, args []string, targets []
 	return responses, nil
 }
 
+func (c *chain) QueryByChaincode(chaincodeName string, args []string, targets []Peer) ([][]byte, error) {
+	return QueryByChaincode(chaincodeName, args, targets, c.clientContext)
+}
+
 // CreateTransactionProposal ...
 /**
  * Create  a proposal for transaction. This involves assembling the proposal
@@ -858,6 +809,12 @@ func (c *chain) QueryByChaincode(chaincodeName string, args []string, targets []
  */
 func (c *chain) CreateTransactionProposal(chaincodeName string, chainID string,
 	args []string, sign bool, transientData map[string][]byte) (*TransactionProposal, error) {
+	return CreateTransactionProposal(chaincodeName, chainID, args, sign, transientData, c.clientContext)
+}
+
+//CreateTransactionProposal  ...
+func CreateTransactionProposal(chaincodeName string, chainID string,
+	args []string, sign bool, transientData map[string][]byte, clientContext Client) (*TransactionProposal, error) {
 
 	argsArray := make([][]byte, len(args))
 	for i, arg := range args {
@@ -867,7 +824,7 @@ func (c *chain) CreateTransactionProposal(chaincodeName string, chainID string,
 		Type: pb.ChaincodeSpec_GOLANG, ChaincodeId: &pb.ChaincodeID{Name: chaincodeName},
 		Input: &pb.ChaincodeInput{Args: argsArray}}}
 
-	user, err := c.clientContext.LoadUserFromStateStore("")
+	user, err := clientContext.LoadUserFromStateStore("")
 	if err != nil {
 		return nil, fmt.Errorf("LoadUserFromStateStore return error: %s", err)
 	}
@@ -887,8 +844,8 @@ func (c *chain) CreateTransactionProposal(chaincodeName string, chainID string,
 		return nil, err
 	}
 
-	signature, err := c.signObjectWithKey(proposalBytes, user.GetPrivateKey(),
-		&bccsp.SHAOpts{}, nil)
+	signature, err := signObjectWithKey(proposalBytes, user.GetPrivateKey(),
+		&bccsp.SHAOpts{}, nil, clientContext.GetCryptoSuite())
 	if err != nil {
 		return nil, err
 	}
@@ -898,6 +855,7 @@ func (c *chain) CreateTransactionProposal(chaincodeName string, chainID string,
 		signedProposal: signedProposal,
 		proposal:       proposal,
 	}, nil
+
 }
 
 // SendTransactionProposal ...
@@ -914,6 +872,20 @@ func (c *chain) SendTransactionProposal(proposal *TransactionProposal, retry int
 	if err != nil {
 		return nil, fmt.Errorf("GetTargetPeers return error: %s", err)
 	}
+	if len(targetPeers) < 1 {
+		return nil, fmt.Errorf("Missing peer objects for sending transaction proposal")
+	}
+
+	return SendTransactionProposal(proposal, retry, targetPeers)
+
+}
+
+//SendTransactionProposal ...
+func SendTransactionProposal(proposal *TransactionProposal, retry int, targetPeers []Peer) ([]*TransactionProposalResponse, error) {
+
+	if proposal == nil || proposal.signedProposal == nil {
+		return nil, fmt.Errorf("signedProposal is nil")
+	}
 
 	if len(targetPeers) < 1 {
 		return nil, fmt.Errorf("Missing peer objects for sending transaction proposal")
@@ -1094,77 +1066,6 @@ func (c *chain) SendTransaction(tx *Transaction) ([]*TransactionResponse, error)
 	return transactionResponses, nil
 }
 
-// SendInstallProposal ...
-/**
-* Sends an install proposal to one or more endorsing peers.
-* @param {string} chaincodeName: required - The name of the chaincode.
-* @param {[]string} chaincodePath: required - string of the path to the location of the source code of the chaincode
-* @param {[]string} chaincodeVersion: required - string of the version of the chaincode
-* @param {[]string} chaincodeVersion: optional - Array of byte the chaincodePackage
- */
-func (c *chain) SendInstallProposal(chaincodeName string, chaincodePath string, chaincodeVersion string, chaincodePackage []byte, targets []Peer) ([]*TransactionProposalResponse, string, error) {
-
-	if chaincodeName == "" {
-		return nil, "", fmt.Errorf("Missing 'chaincodeName' parameter")
-	}
-	if chaincodePath == "" {
-		return nil, "", fmt.Errorf("Missing 'chaincodePath' parameter")
-	}
-	if chaincodeVersion == "" {
-		return nil, "", fmt.Errorf("Missing 'chaincodeVersion' parameter")
-	}
-
-	if chaincodePackage == nil {
-		var err error
-		chaincodePackage, err = PackageCC(chaincodePath, "")
-		if err != nil {
-			return nil, "", fmt.Errorf("PackageCC return error: %s", err)
-		}
-	}
-
-	targetPeers, err := c.getTargetPeers(targets)
-	if err != nil {
-		return nil, "", fmt.Errorf("Invalid target peers return error: %s", err)
-	}
-
-	if len(targetPeers) < 1 {
-		return nil, "", fmt.Errorf("Missing peer objects for install CC proposal")
-	}
-
-	now := time.Now()
-	cds := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: &pb.ChaincodeSpec{
-		Type: pb.ChaincodeSpec_GOLANG, ChaincodeId: &pb.ChaincodeID{Name: chaincodeName, Path: chaincodePath, Version: chaincodeVersion}},
-		CodePackage: chaincodePackage, EffectiveDate: &google_protobuf.Timestamp{Seconds: int64(now.Second()), Nanos: int32(now.Nanosecond())}}
-
-	user, err := c.clientContext.LoadUserFromStateStore("")
-	if err != nil {
-		return nil, "", fmt.Errorf("LoadUserFromStateStore return error: %s", err)
-	}
-
-	creatorID, err := getSerializedIdentity(user.GetEnrollmentCertificate())
-	if err != nil {
-		return nil, "", err
-	}
-
-	// create an install from a chaincodeDeploymentSpec
-	proposal, txID, err := protos_utils.CreateInstallProposalFromCDS(cds, creatorID)
-	if err != nil {
-		return nil, "", fmt.Errorf("Could not create chaincode Deploy proposal, err %s", err)
-	}
-
-	signedProposal, err := c.signProposal(proposal)
-	if err != nil {
-		return nil, "", err
-	}
-
-	transactionProposalResponse, err := c.SendTransactionProposal(&TransactionProposal{
-		signedProposal: signedProposal,
-		proposal:       proposal,
-		TransactionID:  txID,
-	}, 0, targetPeers)
-	return transactionProposalResponse, txID, err
-}
-
 // SendInstantiateProposal ...
 /**
 * Sends an instantiate proposal to one or more endorsing peers.
@@ -1187,6 +1088,7 @@ func (c *chain) SendInstantiateProposal(chaincodeName string, chainID string,
 		return nil, "", fmt.Errorf("Missing 'chaincodePath' parameter")
 	}
 	if chaincodeVersion == "" {
+
 		return nil, "", fmt.Errorf("Missing 'chaincodeVersion' parameter")
 	}
 
@@ -1252,8 +1154,8 @@ func (c *chain) SignPayload(payload []byte) (*SignedEnvelope, error) {
 		return nil, fmt.Errorf("LoadUserFromStateStore returned error: %s", err)
 	}
 
-	signature, err := c.signObjectWithKey(payload, user.GetPrivateKey(),
-		&bccsp.SHAOpts{}, nil)
+	signature, err := signObjectWithKey(payload, user.GetPrivateKey(),
+		&bccsp.SHAOpts{}, nil, c.clientContext.GetCryptoSuite())
 	if err != nil {
 		return nil, err
 	}
@@ -1365,9 +1267,8 @@ func (c *chain) SendEnvelope(envelope *SignedEnvelope) (*common.Block, error) {
 
 // signObjectWithKey will sign the given object with the given key,
 // hashOpts and signerOpts
-func (c *chain) signObjectWithKey(object []byte, key bccsp.Key,
-	hashOpts bccsp.HashOpts, signerOpts bccsp.SignerOpts) ([]byte, error) {
-	cryptoSuite := c.clientContext.GetCryptoSuite()
+func signObjectWithKey(object []byte, key bccsp.Key,
+	hashOpts bccsp.HashOpts, signerOpts bccsp.SignerOpts, cryptoSuite bccsp.BCCSP) ([]byte, error) {
 	digest, err := cryptoSuite.Hash(object, hashOpts)
 	if err != nil {
 		return nil, err
@@ -1391,7 +1292,7 @@ func (c *chain) signProposal(proposal *pb.Proposal) (*pb.SignedProposal, error)
 		return nil, err
 	}
 
-	signature, err := c.signObjectWithKey(proposalBytes, user.GetPrivateKey(), &bccsp.SHAOpts{}, nil)
+	signature, err := signObjectWithKey(proposalBytes, user.GetPrivateKey(), &bccsp.SHAOpts{}, nil, c.clientContext.GetCryptoSuite())
 	if err != nil {
 		return nil, err
 	}

fabric-client/chain_test.go

@@ -73,17 +73,6 @@ func TestQueryMethods(t *testing.T) {
 	if err == nil {
 		t.Fatalf("Query hash cannot be nil")
 	}
-
-	_, err = chain.QueryChannels(nil)
-	if err == nil {
-		t.Fatalf("QueryChanels: peer cannot be nil")
-	}
-
-	_, err = chain.QueryInstalledChaincodes(nil)
-	if err == nil {
-		t.Fatalf("QueryInstalledChaincodes: peer cannot be nil")
-	}
-
 	_, err = chain.QueryByChaincode("", []string{"method"}, nil)
 	if err == nil {
 		t.Fatalf("QueryByChaincode: name cannot be empty")
@@ -221,7 +210,7 @@ func TestJoinChannel(t *testing.T) {
 	var peers []Peer
 	endorserServer := startEndorserServer(t)
 	chain, _ := setupTestChain()
-	peer, _ := CreateNewPeer(testAddress, "", "")
+	peer, _ := NewPeer(testAddress, "", "")
 	peers = append(peers, peer)
 	orderer := &mockOrderer{DeliverResponse: NewMockDeliverResponse(mocks.NewSimpleMockBlock())}
 	nonce, _ := util.GenerateRandomNonce()