[FAB-8299] Rename ChannelConfig to Config

Change-Id: If8d9358d7ad5ff9ccd72443970255593fd6d68e5 Signed-off-by: Sandra Vrtikapa <sandra.vrtikapa@securekey.com>
hyperledger · Feb 14, 2018 · 614551a · 614551a
1 parent b447674
commit 614551a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/api/apifabclient/context.go b/api/apifabclient/context.go
@@ -31,7 +31,7 @@ type ChannelProvider interface {
 
 // ChannelService supplies services related to a channel.
 type ChannelService interface {
-	ChannelConfig() (ChannelConfig, error)
+	Config() (ChannelConfig, error)
 	Ledger() (ChannelLedger, error)
 	Channel() (Channel, error)
 	EventHub() (EventHub, error) // TODO support new event delivery

diff --git a/pkg/fabric-client/mocks/mockchprovider.go b/pkg/fabric-client/mocks/mockchprovider.go
@@ -64,8 +64,8 @@ func (cs *MockChannelService) Channel() (fab.Channel, error) {
 	return ch, nil
 }
 
-// ChannelConfig ...
-func (cs *MockChannelService) ChannelConfig() (fab.ChannelConfig, error) {
+// Config ...
+func (cs *MockChannelService) Config() (fab.ChannelConfig, error) {
 	return nil, nil
 }
 

diff --git a/pkg/fabsdk/provider/chpvdr/chprovider.go b/pkg/fabsdk/provider/chpvdr/chprovider.go
@@ -88,8 +88,8 @@ func (cs *ChannelService) EventHub() (apifabclient.EventHub, error) {
 	return cs.fabricProvider.CreateEventHub(cs.identityContext, cs.cfg.Name())
 }
 
-// ChannelConfig returns the ChannelConfig for the named channel
-func (cs *ChannelService) ChannelConfig() (apifabclient.ChannelConfig, error) {
+// Config returns the Config for the named channel
+func (cs *ChannelService) Config() (apifabclient.ChannelConfig, error) {
 	return cs.fabricProvider.CreateChannelConfig(cs.identityContext, cs.cfg.Name())
 }
 

diff --git a/test/integration/sdk/channel_config_test.go b/test/integration/sdk/channel_config_test.go
@@ -46,7 +46,7 @@ func TestChannelConfig(t *testing.T) {
 		t.Fatalf("Failed to create new channel service: %s", err)
 	}
 
-	cfg, err := cs.ChannelConfig()
+	cfg, err := cs.Config()
 	if err != nil {
 		t.Fatalf("Failed to create new channel config: %s", err)
 	}
@@ -97,7 +97,7 @@ func TestChannelConfigWithOrderer(t *testing.T) {
 		t.Fatalf("Failed to create new channel service: %s", err)
 	}
 
-	cfg, err := cs.ChannelConfig()
+	cfg, err := cs.Config()
 	if err != nil {
 		t.Fatalf("Failed to create new channel config: %s", err)
 	}