[FAB-8659]Remove deprecated code all but channel

Change-Id: Ia5da6e6c3d567325682d3d6d5c49d8c54261fe8e Signed-off-by: biljana lukovic <biljana.lukovic@securekey.com>
hyperledger · Mar 5, 2018 · d7c04c5 · d7c04c5
1 parent c13b6d3
commit d7c04c5
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 418 deletions.
diff --git a/pkg/context/api/fab/deprecated.go b/pkg/context/api/fab/deprecated.go
@@ -33,7 +33,6 @@ type Channel interface {
 	SendUpgradeProposal(chaincodeName string, args [][]byte, chaincodePath string, chaincodeVersion string, chaincodePolicy *common.SignaturePolicyEnvelope, targets []ProposalProcessor) ([]*TransactionProposalResponse, TransactionID, error)
 
 	// Network
-	// Deprecated: getters/setters are deprecated from interface.
 	AddPeer(peer Peer) error
 	RemovePeer(peer Peer)
 	Peers() []Peer
@@ -43,6 +42,7 @@ type Channel interface {
 	AddOrderer(orderer Orderer) error
 	RemoveOrderer(orderer Orderer)
 	Orderers() []Orderer
+	// Deprecated: SetMSPManager should be removed after deprecated channel was removed.
 	SetMSPManager(mspManager msp.MSPManager)
 	MSPManager() msp.MSPManager
 	OrganizationUnits() ([]string, error)

diff --git a/pkg/context/api/fab/proposer.go b/pkg/context/api/fab/proposer.go
@@ -40,7 +40,9 @@ type TransactionHeader interface {
 
 // ChaincodeInvokeRequest contains the parameters for sending a transaction proposal.
 type ChaincodeInvokeRequest struct {
-	Targets      []ProposalProcessor // Deprecated: this parameter is ignored in the new codes and will be removed shortly.
+	// Deprecated: this parameter is ignored in the new codes and will be removed shortly.
+	// The depricated Targets should be removed after deprecated channel was removed
+	Targets      []ProposalProcessor
 	ChaincodeID  string
 	TransientMap map[string][]byte
 	Fcn          string

diff --git a/pkg/core/identitymgr/identitymgr_test.go b/pkg/core/identitymgr/identitymgr_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/hyperledger/fabric-sdk-go/pkg/context/api/core/mocks"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
 	cryptosuiteimpl "github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/sw"
-	bccspwrapper "github.com/hyperledger/fabric-sdk-go/pkg/core/cryptosuite/bccsp/wrapper"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/identitymgr/mocks"
 )
 
@@ -270,18 +269,13 @@ func TestRevoke(t *testing.T) {
 	if err != nil {
 		t.Fatalf("NewidentityManagerClient returned error: %v", err)
 	}
-	mockKey := bccspwrapper.GetKey(&mocks.MockKey{})
 
 	// Revoke with nil request
 	_, err = identityManager.Revoke(nil)
 	if err == nil {
 		t.Fatalf("Expected error with nil request")
 	}
 
-	user := mocks.NewMockUser("test")
-	user.SetEnrollmentCertificate(readCert(t))
-	user.SetPrivateKey(mockKey)
-
 	_, err = identityManager.Revoke(&core.RevocationRequest{})
 	if err == nil {
 		t.Fatalf("Expected decoding error with test cert")

diff --git a/pkg/core/identitymgr/mocks/mockuser.go b/pkg/core/identitymgr/mocks/mockuser.go
@@ -71,17 +71,11 @@ func (u *MockUser) SetEnrollmentCertificate(cert []byte) {
 }
 
 // SetPrivateKey ...
-/**
- * deprecated.
- */
 func (u *MockUser) SetPrivateKey(privateKey core.Key) {
 	u.privateKey = privateKey
 }
 
 // PrivateKey ...
-/**
- * deprecated.
- */
 func (u *MockUser) PrivateKey() core.Key {
 	return u.privateKey
 }

diff --git a/pkg/fab/mocks/mockuser.go b/pkg/fab/mocks/mockuser.go
@@ -78,17 +78,11 @@ func (u *MockUser) SetEnrollmentCertificate(cert []byte) {
 }
 
 // SetPrivateKey ...
-/**
- * deprecated.
- */
 func (u *MockUser) SetPrivateKey(privateKey core.Key) {
 	u.privateKey = privateKey
 }
 
 // PrivateKey ...
-/**
- * deprecated.
- */
 func (u *MockUser) PrivateKey() core.Key {
 	return u.privateKey
 }

diff --git a/pkg/fab/peer/deprecated.go b/pkg/fab/peer/deprecated.go