[FAB-6845] Fix broken master

Jason Yellick · Jason Yellick · commit a47bf65e1957 · 2017-10-31T17:00:36.000-04:00
A merge created a CI failure, as the new version dependencies in the MSP
code conflict with the idemix tests, this CR fixes it.

Change-Id: I958f4f4c37a44bc9dbc60b939e7a0236852ae1ae
Signed-off-by: Jason Yellick &lt;jyellick@us.ibm.com&gt;
diff --git a/common/tools/idemixgen/idemixca/idemixca_test.go b/common/tools/idemixgen/idemixca/idemixca_test.go
@@ -93,7 +93,7 @@ func writeSignerToFile(signerBytes []byte) error {
 // with the generated config bytes
 func setupMSP() error {
 	// setup an idemix msp from the test directory
-	msp, err := m.New(&m.IdemixNewOpts{NewBaseOpts: m.NewBaseOpts{Version: m.MSPv1_0}})
+	msp, err := m.New(&m.IdemixNewOpts{NewBaseOpts: m.NewBaseOpts{Version: m.MSPv1_1}})
 	if err != nil {
 		return errors.Wrap(err, "Getting MSP failed")
 	}

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func writeSignerToFile(signerBytes []byte) error {`
`93`	`93`	`// with the generated config bytes`
`94`	`94`	`func setupMSP() error {`
`95`	`95`	`// setup an idemix msp from the test directory`
`96`		`- msp, err := m.New(&m.IdemixNewOpts{NewBaseOpts: m.NewBaseOpts{Version: m.MSPv1_0}})`
	`96`	`+ msp, err := m.New(&m.IdemixNewOpts{NewBaseOpts: m.NewBaseOpts{Version: m.MSPv1_1}})`
`97`	`97`	`if err != nil {`
`98`	`98`	`return errors.Wrap(err, "Getting MSP failed")`
`99`	`99`	`}`