FABJ-375 Enroll. interface not dependent on CA

Change-Id: I632f9b01ec54df2e52c0fa9b4b8d11f9f3a85aae
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

src/main/java/org/hyperledger/fabric/sdk/identity/IdentityFactory.java

@@ -13,18 +13,15 @@ public static SigningIdentity getSigningIdentity(CryptoSuite cryptoSuite, User u
         Enrollment enrollment = user.getEnrollment();
 
         try {
-            if (enrollment instanceof X509Enrollment) {
+            if (enrollment instanceof IdemixEnrollment) { // Need Idemix signer for this.
+                return new IdemixSigningIdentity((IdemixEnrollment) enrollment);
+            } else { // for now all others are x509
                 return new X509SigningIdentity(cryptoSuite, user);
             }
 
-            if (enrollment instanceof IdemixEnrollment) {
-                return new IdemixSigningIdentity((IdemixEnrollment) enrollment);
-            }
         } catch (Exception e) {
             throw new IllegalStateException(e.getMessage(), e);
         }
-
-        throw new IllegalStateException("Invalid enrollment. Expected either X509Enrollment or IdemixEnrollment." + enrollment);
     }
 
 }

src/test/fixture/sdkintegration/nodecc/sample1/package.json

@@ -13,6 +13,6 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "unstable"
+      "fabric-shim": "~1.3.0"
     }
   }

src/test/fixture/sdkintegration/nodecc/sample_11/package.json

@@ -13,6 +13,6 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-      "fabric-shim": "unstable"
+      "fabric-shim": "~1.3.0"
     }
   }

src/test/java/org/hyperledger/fabric/sdkintegration/SampleStore.java

@@ -45,7 +45,6 @@
 import org.hyperledger.fabric.sdk.Enrollment;
 import org.hyperledger.fabric.sdk.HFClient;
 import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
-import org.hyperledger.fabric.sdk.identity.X509Enrollment;
 import org.hyperledger.fabric.sdk.security.CryptoSuite;
 
 /**
@@ -192,7 +191,7 @@ public SampleUser getMember(String name, String org, String mspId, File privateK
 
             PrivateKey privateKey = getPrivateKeyFromBytes(IOUtils.toByteArray(new FileInputStream(privateKeyFile)));
 
-            sampleUser.setEnrollment(new X509Enrollment(privateKey, certificate));
+            sampleUser.setEnrollment(new SampleStoreEnrollement(privateKey, certificate));
 
             sampleUser.saveState();
 
@@ -234,6 +233,33 @@ static PrivateKey getPrivateKeyFromBytes(byte[] data) throws IOException, NoSuch
         return privateKey;
     }
 
+    // Use this to make sure SDK is not dependent on HFCA enrollment for non-Idemix
+    static final class SampleStoreEnrollement implements Enrollment, Serializable {
+
+        private static final long serialVersionUID = -2784835212445309006L;
+        private final PrivateKey privateKey;
+        private final String certificate;
+
+        SampleStoreEnrollement(PrivateKey privateKey, String certificate) {
+
+            this.certificate = certificate;
+
+            this.privateKey = privateKey;
+        }
+
+        @Override
+        public PrivateKey getKey() {
+
+            return privateKey;
+        }
+
+        @Override
+        public String getCert() {
+            return certificate;
+        }
+
+    }
+
     void saveChannel(Channel channel) throws IOException, InvalidArgumentException {
 
         setValue("channel." + channel.getName(), Hex.toHexString(channel.serializeChannel()));