[FAB-7566] appOrgs put into wrong key in helper.go

yacovm · yacovm · commit 745331ecf7cb · 2017-12-28T16:05:52.000+02:00
The function MakeGenesisBlockFromMSPs skips appOrgID
and instead encodes the applicationOrg object into the orderer organization.

Change-Id: Ia8bb3b350bc84f9b683a25fc0027aebe6c2e7224
Signed-off-by: yacovm &lt;yacovm@il.ibm.com&gt;
diff --git a/common/configtx/test/helper.go b/common/configtx/test/helper.go
@@ -60,7 +60,7 @@ func MakeGenesisBlockFromMSPs(chainID string, appMSPConf, ordererMSPConf *msppro
 	}
 
 	channelGroup.Groups[channelconfig.OrdererGroupKey].Groups[ordererOrgID] = ordererOrg
-	channelGroup.Groups[channelconfig.ApplicationGroupKey].Groups[ordererOrgID] = applicationOrg
+	channelGroup.Groups[channelconfig.ApplicationGroupKey].Groups[appOrgID] = applicationOrg
 
 	return genesis.NewFactoryImpl(channelGroup).Block(chainID)
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func MakeGenesisBlockFromMSPs(chainID string, appMSPConf, ordererMSPConf *msppro`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`channelGroup.Groups[channelconfig.OrdererGroupKey].Groups[ordererOrgID] = ordererOrg`
`63`		`- channelGroup.Groups[channelconfig.ApplicationGroupKey].Groups[ordererOrgID] = applicationOrg`
	`63`	`+ channelGroup.Groups[channelconfig.ApplicationGroupKey].Groups[appOrgID] = applicationOrg`
`64`	`64`
`65`	`65`	`return genesis.NewFactoryImpl(channelGroup).Block(chainID)`
`66`	`66`	`}`