[FAB-5937] Bad default mod_policy for Consortiums

Jason Yellick · Jason Yellick · commit 615eb21c5e73 · 2017-08-28T10:54:22.000-04:00
This is a backport of the fix from v1.1 for v1.0.2.

The mod_policy for /Channel/Consortiums/Admins currently defaults to
Admins (itself), but this should be /Channel/Orderer/Admins.

This CR fixes configtxgen to set the appropriate default.

Change-Id: Id5cba18a84ddf7ae232836e8b51f54feb31e5008
Signed-off-by: Jason Yellick &lt;jyellick@us.ibm.com&gt;
diff --git a/common/configtx/tool/provisional/provisional.go b/common/configtx/tool/provisional/provisional.go
@@ -194,6 +194,7 @@ func New(conf *genesisconfig.Profile) Generator {
 				Type:  int32(cb.Policy_SIGNATURE),
 				Value: utils.MarshalOrPanic(cauthdsl.AcceptAllPolicy),
 			},
+			ModPolicy: OrdererAdminsPolicy,
 		}
 
 		bs.consortiumsGroups = append(bs.consortiumsGroups, tcg)

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ func New(conf *genesisconfig.Profile) Generator {`
`194`	`194`	`Type: int32(cb.Policy_SIGNATURE),`
`195`	`195`	`Value: utils.MarshalOrPanic(cauthdsl.AcceptAllPolicy),`
`196`	`196`	`},`
	`197`	`+ ModPolicy: OrdererAdminsPolicy,`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`bs.consortiumsGroups = append(bs.consortiumsGroups, tcg)`