Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 0bd2dfa

Browse files
author
Nick Chang-Fong
committed
[FAB-7346] Make IsChaincodeInstalled a private method
In fabric-txn/resmgmtclient, IsChaincodeInstalled was incorrectly exported (see related issue for details). This change makes the method private and updates its uses accordingly. Tested via make all without error. Change-Id: I9c684ad7d73eb2b171c2f8b57a61157637ea2768 Signed-off-by: Nick Chang-Fong <nick@diid.today>
1 parent 7495dc8 commit 0bd2dfa

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/fabric-txn/resmgmtclient/resmgmt.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ func (rc *ResourceMgmtClient) calculateTargets(discovery fab.DiscoveryService, p
213213
return targets, nil
214214
}
215215

216-
// IsChaincodeInstalled verify if chaincode is installed on peer
217-
func (rc *ResourceMgmtClient) IsChaincodeInstalled(req resmgmt.InstallCCRequest, peer fab.Peer) (bool, error) {
216+
// isChaincodeInstalled verify if chaincode is installed on peer
217+
func (rc *ResourceMgmtClient) isChaincodeInstalled(req resmgmt.InstallCCRequest, peer fab.Peer) (bool, error) {
218218
chaincodeQueryResponse, err := rc.client.QueryInstalledChaincodes(peer)
219219
if err != nil {
220220
return false, err
@@ -274,7 +274,7 @@ func (rc *ResourceMgmtClient) InstallCCWithOpts(req resmgmt.InstallCCRequest, op
274274
newTargets := make([]fab.Peer, 0)
275275

276276
for _, target := range targets {
277-
installed, err := rc.IsChaincodeInstalled(req, target)
277+
installed, err := rc.isChaincodeInstalled(req, target)
278278
if err != nil {
279279
// Add to responses with unable to verify error message
280280
response := resmgmt.InstallCCResponse{Target: target.URL(), Err: errors.Errorf("unable to verify if cc is installed on %s", target.URL())}

pkg/fabric-txn/resmgmtclient/resmgmt_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func TestIsChaincodeInstalled(t *testing.T) {
257257
req := resmgmt.InstallCCRequest{Name: "name", Version: "version", Path: "path"}
258258

259259
// Test chaincode installed (valid peer)
260-
installed, err := rc.IsChaincodeInstalled(req, peer)
260+
installed, err := rc.isChaincodeInstalled(req, peer)
261261
if err != nil {
262262
t.Fatal(err)
263263
}
@@ -269,7 +269,7 @@ func TestIsChaincodeInstalled(t *testing.T) {
269269
req = resmgmt.InstallCCRequest{Name: "ID", Version: "v0", Path: "path"}
270270

271271
// Test chaincode installed
272-
installed, err = rc.IsChaincodeInstalled(req, peer)
272+
installed, err = rc.isChaincodeInstalled(req, peer)
273273
if err != nil {
274274
t.Fatal(err)
275275
}
@@ -278,7 +278,7 @@ func TestIsChaincodeInstalled(t *testing.T) {
278278
}
279279

280280
// Test error retrieving installed cc info (peer is nil)
281-
_, err = rc.IsChaincodeInstalled(req, nil)
281+
_, err = rc.isChaincodeInstalled(req, nil)
282282
if err == nil {
283283
t.Fatalf("Should have failed with error in get installed chaincodes")
284284
}

0 commit comments

Comments
 (0)