[FAB-6566] mv config/resources -> resourcesconfig

There used to be a config/channel and a config/resources. This structure was modified and config/channel moved to channelconfig. This CR simply cleans up the structure for symmetry's sake. Change-Id: I2fde9dc0eba1dd0f401397673ebfad823264beb8 Signed-off-by: Jason Yellick <[email protected]>
hyperledger · Oct 12, 2017 · 20b5503 · 20b5503
1 parent 978c48c
commit 20b5503
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/common/config/resources/bundle.go → common/resourcesconfig/bundle.go b/common/config/resources/bundle.go → 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 → common/resourcesconfig/bundle_test.go b/common/config/resources/bundle_test.go → 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 → common/resourcesconfig/policyrouter.go b/common/config/resources/policyrouter.go → 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 → common/resourcesconfig/policyrouter_test.go b/common/config/resources/policyrouter_test.go → 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 → common/resourcesconfig/resources.go b/common/config/resources/resources.go → 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
@@ -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
@@ -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 {