Merge "[FAB-6818] s/policyMarhsalled/policyMarshalled/"

hyperledger · Nov 2, 2017 · 6cf9558 · 6cf9558
2 parents 2d4a96e + 8b3514f
commit 6cf9558
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/peer/chaincode/chaincode.go b/peer/chaincode/chaincode.go
@@ -64,7 +64,7 @@ var (
 	policy            string
 	escc              string
 	vscc              string
-	policyMarhsalled  []byte
+	policyMarshalled  []byte
 	orderingEndpoint  string
 	tls               bool
 	caFile            string

diff --git a/peer/chaincode/common.go b/peer/chaincode/common.go
@@ -187,7 +187,7 @@ func checkChaincodeCmdParams(cmd *cobra.Command) error {
 		if err != nil {
 			return fmt.Errorf("Invalid policy %s", policy)
 		}
-		policyMarhsalled = putils.MarshalOrPanic(p)
+		policyMarshalled = putils.MarshalOrPanic(p)
 	}
 
 	// Check that non-empty chaincode parameters contain only Args as a key.

diff --git a/peer/chaincode/instantiate.go b/peer/chaincode/instantiate.go
@@ -75,7 +75,7 @@ func instantiate(cmd *cobra.Command, cf *ChaincodeCmdFactory) (*protcommon.Envel
 		return nil, fmt.Errorf("Error serializing identity for %s: %s", cf.Signer.GetIdentifier(), err)
 	}
 
-	prop, _, err := utils.CreateDeployProposalFromCDS(chainID, cds, creator, policyMarhsalled, []byte(escc), []byte(vscc))
+	prop, _, err := utils.CreateDeployProposalFromCDS(chainID, cds, creator, policyMarshalled, []byte(escc), []byte(vscc))
 	if err != nil {
 		return nil, fmt.Errorf("Error creating proposal  %s: %s", chainFuncName, err)
 	}

diff --git a/peer/chaincode/upgrade.go b/peer/chaincode/upgrade.go
@@ -74,7 +74,7 @@ func upgrade(cmd *cobra.Command, cf *ChaincodeCmdFactory) (*protcommon.Envelope,
 		return nil, fmt.Errorf("Error serializing identity for %s: %s", cf.Signer.GetIdentifier(), err)
 	}
 
-	prop, _, err := utils.CreateUpgradeProposalFromCDS(chainID, cds, creator, policyMarhsalled, []byte(escc), []byte(vscc))
+	prop, _, err := utils.CreateUpgradeProposalFromCDS(chainID, cds, creator, policyMarshalled, []byte(escc), []byte(vscc))
 	if err != nil {
 		return nil, fmt.Errorf("Error creating proposal %s: %s", chainFuncName, err)
 	}