Skip to content

Commit 6434844

Browse files
author
Jason Yellick
committed
[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]>
1 parent 32b772c commit 6434844

17 files changed

+172
-920
lines changed

common/configtx/handlers/channel/sharedconfig_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func groupToKeyValue(configGroup *cb.ConfigGroup) (string, *cb.ConfigValue) {
3737
panic("No value encoded")
3838
}
3939

40-
func makeInvalidConfigItem() *cb.ConfigValue {
40+
func makeInvalidConfigValue() *cb.ConfigValue {
4141
return &cb.ConfigValue{
4242
Value: []byte("Garbage Data"),
4343
}
@@ -80,7 +80,7 @@ func TestRollback(t *testing.T) {
8080
}
8181

8282
func TestHashingAlgorithm(t *testing.T) {
83-
invalidMessage := makeInvalidConfigItem()
83+
invalidMessage := makeInvalidConfigValue()
8484
invalidAlgorithm := TemplateHashingAlgorithm("MD5")
8585
validAlgorithm := DefaultHashingAlgorithm()
8686

@@ -110,7 +110,7 @@ func TestHashingAlgorithm(t *testing.T) {
110110
}
111111

112112
func TestBlockDataHashingStructure(t *testing.T) {
113-
invalidMessage := makeInvalidConfigItem()
113+
invalidMessage := makeInvalidConfigValue()
114114
invalidWidth := TemplateBlockDataHashingStructure(0)
115115
validWidth := DefaultBlockDataHashingStructure()
116116

@@ -140,7 +140,7 @@ func TestBlockDataHashingStructure(t *testing.T) {
140140
}
141141

142142
func TestOrdererAddresses(t *testing.T) {
143-
invalidMessage := makeInvalidConfigItem()
143+
invalidMessage := makeInvalidConfigValue()
144144
validMessage := DefaultOrdererAddresses()
145145
m := NewSharedConfigImpl(nil, nil)
146146
m.BeginConfig()

common/configtx/inspector/common_types.go

-105
This file was deleted.

common/configtx/inspector/inspector.go

-61
This file was deleted.

common/configtx/inspector/orderer_types.go

-151
This file was deleted.

0 commit comments

Comments
 (0)