[FAB-2170] Remove ConfigItem references

https://jira.hyperledger.org/browse/FAB-2170 This CR finally removes the deprecated ConfigItem interface from both the protos and a few remaining pieces of legacy code. Change-Id: Ie898c3363fea252e24fe320f02dc16e7c5c250b6 Signed-off-by: Jason Yellick <[email protected]>
hyperledger · Feb 14, 2017 · 6434844 · 6434844
1 parent 32b772c
commit 6434844
Show file tree

Hide file tree

Showing 17 changed files with 172 additions and 920 deletions.
diff --git a/common/configtx/handlers/channel/sharedconfig_test.go b/common/configtx/handlers/channel/sharedconfig_test.go
@@ -37,7 +37,7 @@ func groupToKeyValue(configGroup *cb.ConfigGroup) (string, *cb.ConfigValue) {
 	panic("No value encoded")
 }
 
-func makeInvalidConfigItem() *cb.ConfigValue {
+func makeInvalidConfigValue() *cb.ConfigValue {
 	return &cb.ConfigValue{
 		Value: []byte("Garbage Data"),
 	}
@@ -80,7 +80,7 @@ func TestRollback(t *testing.T) {
 }
 
 func TestHashingAlgorithm(t *testing.T) {
-	invalidMessage := makeInvalidConfigItem()
+	invalidMessage := makeInvalidConfigValue()
 	invalidAlgorithm := TemplateHashingAlgorithm("MD5")
 	validAlgorithm := DefaultHashingAlgorithm()
 
@@ -110,7 +110,7 @@ func TestHashingAlgorithm(t *testing.T) {
 }
 
 func TestBlockDataHashingStructure(t *testing.T) {
-	invalidMessage := makeInvalidConfigItem()
+	invalidMessage := makeInvalidConfigValue()
 	invalidWidth := TemplateBlockDataHashingStructure(0)
 	validWidth := DefaultBlockDataHashingStructure()
 
@@ -140,7 +140,7 @@ func TestBlockDataHashingStructure(t *testing.T) {
 }
 
 func TestOrdererAddresses(t *testing.T) {
-	invalidMessage := makeInvalidConfigItem()
+	invalidMessage := makeInvalidConfigValue()
 	validMessage := DefaultOrdererAddresses()
 	m := NewSharedConfigImpl(nil, nil)
 	m.BeginConfig()

diff --git a/common/configtx/inspector/common_types.go b/common/configtx/inspector/common_types.go
diff --git a/common/configtx/inspector/inspector.go b/common/configtx/inspector/inspector.go
diff --git a/common/configtx/inspector/orderer_types.go b/common/configtx/inspector/orderer_types.go