diff --git a/common/config/resources/bundle.go b/common/resourcesconfig/bundle.go similarity index 99% rename from common/config/resources/bundle.go rename to common/resourcesconfig/bundle.go index 60fd6a0526b..e5dfbaac4da 100644 --- a/common/config/resources/bundle.go +++ b/common/resourcesconfig/bundle.go @@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package resources +package resourcesconfig import ( "fmt" diff --git a/common/config/resources/bundle_test.go b/common/resourcesconfig/bundle_test.go similarity index 99% rename from common/config/resources/bundle_test.go rename to common/resourcesconfig/bundle_test.go index 58f24ca6072..5a1c8ac7df1 100644 --- a/common/config/resources/bundle_test.go +++ b/common/resourcesconfig/bundle_test.go @@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package resources +package resourcesconfig import ( "testing" diff --git a/common/config/resources/policyrouter.go b/common/resourcesconfig/policyrouter.go similarity index 98% rename from common/config/resources/policyrouter.go rename to common/resourcesconfig/policyrouter.go index 1a67d61b0a8..23eeb7c7294 100644 --- a/common/config/resources/policyrouter.go +++ b/common/resourcesconfig/policyrouter.go @@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package resources +package resourcesconfig import ( "fmt" diff --git a/common/config/resources/policyrouter_test.go b/common/resourcesconfig/policyrouter_test.go similarity index 99% rename from common/config/resources/policyrouter_test.go rename to common/resourcesconfig/policyrouter_test.go index dc68012db3c..d0185188689 100644 --- a/common/config/resources/policyrouter_test.go +++ b/common/resourcesconfig/policyrouter_test.go @@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package resources +package resourcesconfig import ( "fmt" diff --git a/common/config/resources/resources.go b/common/resourcesconfig/resources.go similarity index 98% rename from common/config/resources/resources.go rename to common/resourcesconfig/resources.go index 13e93e01b81..45927743cf0 100644 --- a/common/config/resources/resources.go +++ b/common/resourcesconfig/resources.go @@ -4,7 +4,7 @@ Copyright IBM Corp. 2017 All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package resources +package resourcesconfig import ( "fmt" diff --git a/core/scc/rscc/rscc.go b/core/scc/rscc/rscc.go index f5202fbfc9a..2820f10d2b1 100644 --- a/core/scc/rscc/rscc.go +++ b/core/scc/rscc/rscc.go @@ -11,9 +11,9 @@ import ( "sync" "github.com/golang/protobuf/proto" - "github.com/hyperledger/fabric/common/config/resources" "github.com/hyperledger/fabric/common/flogging" "github.com/hyperledger/fabric/common/policies" + "github.com/hyperledger/fabric/common/resourcesconfig" "github.com/hyperledger/fabric/core/aclmgmt" "github.com/hyperledger/fabric/core/chaincode/shim" "github.com/hyperledger/fabric/core/ledger" @@ -222,7 +222,7 @@ func (rscc *Rscc) getEnvelopeFromConfig(channel string, cfgb []byte) (*common.En //create the evaluator to provide evaluation services for resources func (rscc *Rscc) createPolicyEvaluator(env *common.Envelope, mspMgr msp.MSPManager, polMgr policies.Manager) (policyEvaluator, error) { - bundle, err := resources.New(env, mspMgr, polMgr) + bundle, err := resourcesconfig.New(env, mspMgr, polMgr) if err != nil { return nil, err } diff --git a/core/scc/rscc/rsccpolicy.go b/core/scc/rscc/rsccpolicy.go index 4f25e53c290..58977e205e5 100644 --- a/core/scc/rscc/rsccpolicy.go +++ b/core/scc/rscc/rsccpolicy.go @@ -9,7 +9,7 @@ package rscc import ( "fmt" - "github.com/hyperledger/fabric/common/config/resources" + "github.com/hyperledger/fabric/common/resourcesconfig" "github.com/hyperledger/fabric/protos/common" pb "github.com/hyperledger/fabric/protos/peer" "github.com/hyperledger/fabric/protos/utils" @@ -41,7 +41,7 @@ type policyEvaluator interface { //policyEvaluatorImpl implements policyEvaluator type policyEvaluatorImpl struct { - bundle *resources.Bundle + bundle *resourcesconfig.Bundle } func (pe *policyEvaluatorImpl) PolicyRefForResource(resName string) string {