[FAB-17743] Rename ConfigTx accessors

Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com>

integration/configtx/configtx_test.go

@@ -195,7 +195,7 @@ var _ = Describe("Config", func() {
 
 			By("ensuring the active channel config matches the submitted config")
 			finalChannelConfig := nwo.GetConfig(network, peer, orderer, "testchannel")
-			Expect(c.Updated()).To(Equal(finalChannelConfig))
+			Expect(c.UpdatedConfig()).To(Equal(finalChannelConfig))
 		}
 	})
 })

pkg/configtx/application.go

@@ -28,7 +28,7 @@ type Application struct {
 // transaction as an Application type. This can be used to retrieve existing values for the application
 // prior to updating the application configuration.
 func (c *ConfigTx) ApplicationConfiguration() (Application, error) {
-	applicationGroup, ok := c.base.ChannelGroup.Groups[ApplicationGroupKey]
+	applicationGroup, ok := c.original.ChannelGroup.Groups[ApplicationGroupKey]
 	if !ok {
 		return Application{}, errors.New("config does not contain application group")
 	}
@@ -196,7 +196,7 @@ func (c *ConfigTx) RemoveACLs(acls []string) error {
 
 // ApplicationACLs returns a map of application acls from a config transaction.
 func (c *ConfigTx) ApplicationACLs() (map[string]string, error) {
-	return getACLs(c.base)
+	return getACLs(c.original)
 }
 
 // getACLs returns a map of ACLS for given config application.
@@ -222,7 +222,7 @@ func getACLs(config *cb.Config) (map[string]string, error) {
 
 // AnchorPeers retrieves existing anchor peers from a application organization.
 func (c *ConfigTx) AnchorPeers(orgName string) ([]Address, error) {
-	applicationOrgGroup, ok := c.base.ChannelGroup.Groups[ApplicationGroupKey].Groups[orgName]
+	applicationOrgGroup, ok := c.original.ChannelGroup.Groups[ApplicationGroupKey].Groups[orgName]
 	if !ok {
 		return nil, fmt.Errorf("application org %s does not exist in channel config", orgName)
 	}

pkg/configtx/application_test.go

@@ -222,8 +222,8 @@ func TestAddAnchorPeer(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	newOrg1AnchorPeer := Address{
@@ -429,8 +429,8 @@ func TestAddAnchorPeerFailure(t *testing.T) {
 			}
 
 			c := ConfigTx{
-				base:    config,
-				updated: config,
+				original: config,
+				updated:  config,
 			}
 
 			if tt.configMod != nil {
@@ -464,8 +464,8 @@ func TestRemoveAnchorPeer(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	expectedUpdatedConfigJSON := `
@@ -622,8 +622,8 @@ func TestRemoveAnchorPeerFailure(t *testing.T) {
 			}
 
 			c := ConfigTx{
-				base:    config,
-				updated: config,
+				original: config,
+				updated:  config,
 			}
 
 			err = c.RemoveAnchorPeer(tt.orgName, tt.anchorPeerToRemove)
@@ -649,8 +649,8 @@ func TestAnchorPeer(t *testing.T) {
 
 	expectedAnchorPeer := Address{Host: "host1", Port: 123}
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	err = c.AddAnchorPeer("Org1", expectedAnchorPeer)
@@ -687,8 +687,8 @@ func TestAnchorPeerFailures(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	for _, test := range []struct {
@@ -763,8 +763,8 @@ func TestAddACL(t *testing.T) {
 				tt.configMod(config)
 			}
 			c := ConfigTx{
-				base:    config,
-				updated: config,
+				original: config,
+				updated:  config,
 			}
 
 			err = c.AddACLs(tt.newACL)
@@ -837,8 +837,8 @@ func TestRemoveACL(t *testing.T) {
 				tt.configMod(config)
 			}
 			c := &ConfigTx{
-				base:    config,
-				updated: config,
+				original: config,
+				updated:  config,
 			}
 
 			err = c.RemoveACLs(tt.removeACL)
@@ -871,8 +871,8 @@ func TestAddApplicationOrg(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	org := Organization{
@@ -1058,8 +1058,8 @@ func TestAddApplicationOrgFailures(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	org := Organization{
@@ -1087,8 +1087,8 @@ func TestApplicationConfiguration(t *testing.T) {
 	}
 
 	c := &ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 	for _, org := range baseApplicationConf.Organizations {
 		err = c.AddApplicationOrg(org)
@@ -1114,7 +1114,7 @@ func TestApplicationConfigurationFailure(t *testing.T) {
 		{
 			testName: "When the application group does not exist",
 			configMod: func(ct *ConfigTx, appOrg Application, gt *GomegaWithT) {
-				delete(ct.base.ChannelGroup.Groups, ApplicationGroupKey)
+				delete(ct.original.ChannelGroup.Groups, ApplicationGroupKey)
 			},
 			expectedErr: "config does not contain application group",
 		},
@@ -1152,8 +1152,8 @@ func TestApplicationConfigurationFailure(t *testing.T) {
 			}
 
 			c := &ConfigTx{
-				base:    config,
-				updated: config,
+				original: config,
+				updated:  config,
 			}
 			if tt.configMod != nil {
 				tt.configMod(c, baseApplicationConf, gt)
@@ -1183,7 +1183,7 @@ func TestApplicationACLs(t *testing.T) {
 	}
 
 	c := &ConfigTx{
-		base: config,
+		original: config,
 	}
 
 	applicationACLs, err := c.ApplicationACLs()
@@ -1203,7 +1203,7 @@ func TestApplicationACLsFailure(t *testing.T) {
 	}
 
 	c := &ConfigTx{
-		base: config,
+		original: config,
 	}
 
 	applicationACLs, err := c.ApplicationACLs()

pkg/configtx/capabilities.go

@@ -17,7 +17,7 @@ import (
 // ChannelCapabilities returns a map of enabled channel capabilities
 // from a config transaction.
 func (c *ConfigTx) ChannelCapabilities() ([]string, error) {
-	capabilities, err := getCapabilities(c.base.ChannelGroup)
+	capabilities, err := getCapabilities(c.original.ChannelGroup)
 	if err != nil {
 		return nil, fmt.Errorf("retrieving channel capabilities: %v", err)
 	}
@@ -28,7 +28,7 @@ func (c *ConfigTx) ChannelCapabilities() ([]string, error) {
 // OrdererCapabilities returns a map of enabled orderer capabilities
 // from a config transaction.
 func (c *ConfigTx) OrdererCapabilities() ([]string, error) {
-	orderer, ok := c.base.ChannelGroup.Groups[OrdererGroupKey]
+	orderer, ok := c.original.ChannelGroup.Groups[OrdererGroupKey]
 	if !ok {
 		return nil, errors.New("orderer missing from config")
 	}
@@ -44,7 +44,7 @@ func (c *ConfigTx) OrdererCapabilities() ([]string, error) {
 // ApplicationCapabilities returns a map of enabled application capabilities
 // from a config transaction.
 func (c *ConfigTx) ApplicationCapabilities() ([]string, error) {
-	application, ok := c.base.ChannelGroup.Groups[ApplicationGroupKey]
+	application, ok := c.original.ChannelGroup.Groups[ApplicationGroupKey]
 	if !ok {
 		return nil, errors.New("application missing from config")
 	}

pkg/configtx/capabilities_test.go

@@ -33,8 +33,8 @@ func TestChannelCapabilities(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	err := setValue(config.ChannelGroup, capabilitiesValue(expectedCapabilities), AdminsPolicyKey)
@@ -69,8 +69,8 @@ func TestOrdererCapabilities(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	ordererCapabilities, err := c.OrdererCapabilities()
@@ -96,8 +96,8 @@ func TestOrdererCapabilitiesFailure(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	ordererCapabilities, err := c.OrdererCapabilities()
@@ -123,8 +123,8 @@ func TestApplicationCapabilities(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	applicationCapabilities, err := c.ApplicationCapabilities()
@@ -150,8 +150,8 @@ func TestApplicationCapabilitiesFailure(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    config,
-		updated: config,
+		original: config,
+		updated:  config,
 	}
 
 	applicationCapabilities, err := c.ApplicationCapabilities()

pkg/configtx/config.go

@@ -74,30 +74,30 @@ type standardConfigPolicy struct {
 	value *cb.Policy
 }
 
-// ConfigTx wraps a config transaction
+// ConfigTx wraps a config transaction.
 type ConfigTx struct {
 	// original state of the config
-	base *cb.Config
+	original *cb.Config
 	// modified state of the config
 	updated *cb.Config
 }
 
 // New returns an config.
 func New(config *cb.Config) ConfigTx {
 	return ConfigTx{
-		base: config,
+		original: config,
 		// Clone the base config for processing updates
 		updated: proto.Clone(config).(*cb.Config),
 	}
 }
 
-// Base returns the base config
-func (c *ConfigTx) Base() *cb.Config {
-	return c.base
+// OriginalConfig returns the original unedited config.
+func (c *ConfigTx) OriginalConfig() *cb.Config {
+	return c.original
 }
 
-// Updated returns the updated config
-func (c *ConfigTx) Updated() *cb.Config {
+// UpdatedConfig returns the modified config.
+func (c *ConfigTx) UpdatedConfig() *cb.Config {
 	return c.updated
 }
 
@@ -107,7 +107,7 @@ func (c *ConfigTx) ComputeUpdate(channelID string) (*cb.ConfigUpdate, error) {
 		return nil, errors.New("channel ID is required")
 	}
 
-	updt, err := computeConfigUpdate(c.base, c.updated)
+	updt, err := computeConfigUpdate(c.original, c.updated)
 	if err != nil {
 		return nil, fmt.Errorf("failed to compute update: %v", err)
 	}
@@ -119,7 +119,7 @@ func (c *ConfigTx) ComputeUpdate(channelID string) (*cb.ConfigUpdate, error) {
 
 // ChannelConfiguration returns a channel configuration value from a config transaction.
 func (c *ConfigTx) ChannelConfiguration() (Channel, error) {
-	channelGroup := c.base.ChannelGroup
+	channelGroup := c.original.ChannelGroup
 	var (
 		err          error
 		consortium   string

pkg/configtx/config_test.go

@@ -1278,8 +1278,8 @@ func TestComputeUpdate(t *testing.T) {
 	}
 
 	c := ConfigTx{
-		base:    base,
-		updated: updated,
+		original: base,
+		updated:  updated,
 	}
 
 	channelID := "testChannel"
@@ -1314,8 +1314,8 @@ func TestComputeUpdateFailures(t *testing.T) {
 	updated := &cb.Config{}
 
 	c := ConfigTx{
-		base:    base,
-		updated: updated,
+		original: base,
+		updated:  updated,
 	}
 
 	for _, test := range []struct {

pkg/configtx/consortiums.go

@@ -65,7 +65,7 @@ func (c *ConfigTx) AddOrgToConsortium(org Organization, consortium string) error
 // Consortiums returns a list of consortiums for the channel configuration.
 // Consortiums is only defined for the ordering system channel.
 func (c *ConfigTx) Consortiums() ([]Consortium, error) {
-	consortiumsGroup, ok := c.base.ChannelGroup.Groups[ConsortiumsGroupKey]
+	consortiumsGroup, ok := c.original.ChannelGroup.Groups[ConsortiumsGroupKey]
 	if !ok {
 		return nil, errors.New("channel configuration does not have consortiums")
 	}