[FAB-6696] Fix printOrg output to deeply marshal

Jason Yellick · Jason Yellick · commit ed0289882f63 · 2017-10-19T15:53:18.000-04:00
The configtxgen -printOrg function currently prints a version of the
organization definition with the MSP definition opaque.  This is a
problem for the configtxlator APIs which expect for the JSON to be
deeply marshaled.

This CR simply fixes the printing by changing the type passed in to be
the proper annotated dynamic type, rather than the base ConfigGroup
type.

Change-Id: I7952ad7c052f6f063ab747f323c2ab531340887f
Signed-off-by: Jason Yellick &lt;jyellick@us.ibm.com&gt;
diff --git a/common/tools/configtxgen/main.go b/common/tools/configtxgen/main.go
@@ -213,7 +213,7 @@ func doPrintOrg(t *genesisconfig.TopLevel, printOrg string) error {
 				return errors.Wrapf(err, "bad org definition for org %s", org.Name)
 			}
 
-			if err := protolator.DeepMarshalJSON(os.Stdout, og); err != nil {
+			if err := protolator.DeepMarshalJSON(os.Stdout, &cb.DynamicConsortiumOrgGroup{ConfigGroup: og}); err != nil {
 				return errors.Wrapf(err, "malformed org definition for org: %s", org.Name)
 			}
 			return nil

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func doPrintOrg(t *genesisconfig.TopLevel, printOrg string) error {`
`213`	`213`	`return errors.Wrapf(err, "bad org definition for org %s", org.Name)`
`214`	`214`	`}`
`215`	`215`
`216`		`- if err := protolator.DeepMarshalJSON(os.Stdout, og); err != nil {`
	`216`	`+ if err := protolator.DeepMarshalJSON(os.Stdout, &cb.DynamicConsortiumOrgGroup{ConfigGroup: og}); err != nil {`
`217`	`217`	`return errors.Wrapf(err, "malformed org definition for org: %s", org.Name)`
`218`	`218`	`}`
`219`	`219`	`return nil`