[FAB-2232] Rename test MSP to DEFAULT

Jason Yellick · Jason Yellick · commit b12c76f7def2 · 2017-02-15T13:23:48.000-05:00
https://jira.hyperledger.org/browse/FAB-2232 The FAB-1880 change series picked the name "SAMPLE" when instantiating the sample MSP config when an ID was added to the GetLocalMspFromDir function. This apparently as a side effect breaks other parts fo the system, so this CR sets this ID back to "DEFAULT" as other pieces of the system expect. Change-Id: I5df97693561ab53d47f34d14d381e4f2fe4a92ad Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
diff --git a/common/configtx/test/helper.go b/common/configtx/test/helper.go
@@ -85,7 +85,9 @@ func OrdererTemplate() configtx.Template {
 	return provisional.New(genConf).ChannelTemplate()
 }
 
-const sampleOrgID = "SAMPLE"
+// sampleOrgID apparently _must_ be set to DEFAULT or things break
+// Beware when changing!
+const sampleOrgID = "DEFAULT"
 
 // ApplicationOrgTemplate returns the SAMPLE org with MSP template
 func ApplicationOrgTemplate() configtx.Template {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,9 @@ func OrdererTemplate() configtx.Template {`
`85`	`85`	`return provisional.New(genConf).ChannelTemplate()`
`86`	`86`	`}`
`87`	`87`
`88`		`-const sampleOrgID = "SAMPLE"`
	`88`	`+// sampleOrgID apparently _must_ be set to DEFAULT or things break`
	`89`	`+// Beware when changing!`
	`90`	`+const sampleOrgID = "DEFAULT"`
`89`	`91`
`90`	`92`	`// ApplicationOrgTemplate returns the SAMPLE org with MSP template`
`91`	`93`	`func ApplicationOrgTemplate() configtx.Template {`