reduce parsing and getters (hyperledger-archives#2804)

Signed-off-by: Nick Lincoln <[email protected]>
Fiannaidhe · Nov 22, 2017 · 72633b1 · 72633b1
1 parent 87ef8ba
commit 72633b1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 37 deletions.
diff --git a/packages/composer-runtime/lib/engine.queries.js b/packages/composer-runtime/lib/engine.queries.js
@@ -68,28 +68,25 @@ class EngineQueries {
         const accessController = context.getAccessController();
         return context.getCompiledQueryBundle().execute(dataService, identifier, parameters)
             .then((objects) => {
-                return objects.map((object) => {
-                    object = Registry.removeInternalProperties(object);
-                    return serializer.fromJSON(object);
-                }).reduce((resources, resource) => {
-                    return resources.then((resources) => {
-                        return accessController.check(resource, 'READ')
+                objects.forEach((object) => {
+                    Registry.removeInternalProperties(object);
+                });
+                return objects.reduce((promiseChain, object) => {
+                    return promiseChain.then((objects) => {
+                        return accessController.check(serializer.fromJSON(object), 'READ')
                             .then(() => {
-                                resources.push(resource);
-                                return resources;
+                                objects.push(object);
+                                return objects;
                             })
                             .catch((error) => {
-                                return resources;
+                                return objects;
                             });
                     });
                 }, Promise.resolve([]));
             })
-            .then((resources) => {
-                resources = resources.map((resource) => {
-                    return serializer.toJSON(resource);
-                });
-                LOG.exit(method, resources);
-                return resources;
+            .then((objects) => {
+                LOG.exit(method, objects);
+                return objects;
             });
 
     }

diff --git a/packages/composer-runtime/lib/identitymanager.js b/packages/composer-runtime/lib/identitymanager.js
@@ -73,41 +73,41 @@ class IdentityManager extends TransactionHandler {
                 // Check to see if the identity exists.
                 identityRegistry = identityRegistry_;
                 identifier = this.identityService.getIdentifier();
-                identityName = this.identityService.getName();
-                return identityRegistry.exists(identifier);
-
+                return identityRegistry.get(identifier)
+                .catch(() => {
+                    return null;
+                });
             })
-            .then((exists) => {
+            .then((identity) => {
 
                 // If it doesn't exist, then try again with the temporary identifier, which is hash(name, issuer).
-                if (!exists) {
+                if (!identity) {
                     const sha256 = createHash('sha256');
                     const name = this.identityService.getName();
                     const issuer = this.identityService.getIssuer();
                     sha256.update(name, 'utf8');
                     sha256.update(issuer, 'utf8');
                     identifier = sha256.digest('hex');
-                    return identityRegistry.exists(identifier);
+                    return identityRegistry.get(identifier)
+                    .catch(() => {
+                        return null;
+                    });
                 } else {
-                    return exists;
+                    return identity;
                 }
-
             })
-            .then((exists) => {
+            .then((identity) => {
 
                 // If it still doesn't exist, throw!
-                if (!exists) {
-                    const error = new Error('The current identity has not been registered: '+identityName);
-                    error.identityName=identityName;
+                if (!identity) {
+                    identityName = this.identityService.getName();
+                    const error = new Error('The current identity has not been registered: ' + identityName);
+                    error.identityName = identityName;
                     LOG.error(method, error);
                     throw error;
                 }
 
-                // Get the identity.
-                return identityRegistry.get(identifier);
-
-            })
-            .then((identity) => {
+                // Return the identity.
                 LOG.exit(method, identity);
                 return identity;
             });

diff --git a/packages/composer-runtime/test/identitymanager.js b/packages/composer-runtime/test/identitymanager.js
@@ -77,30 +77,28 @@ describe('IdentityManager', () => {
         it('should look up an identity using the identifier', () => {
             mockIdentityService.getIdentifier.returns('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63');
             let identity = factory.newResource('org.hyperledger.composer.system', 'Identity', '7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63');
-            mockIdentityRegistry.exists.withArgs('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63').resolves(true);
             mockIdentityRegistry.get.withArgs('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63').resolves(identity);
             return identityManager.getIdentity()
                 .should.eventually.be.equal(identity);
         });
 
         it('should look up an issued identity using the name and issuer', () => {
             mockIdentityService.getIdentifier.returns('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63');
-            mockIdentityRegistry.exists.withArgs('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63').resolves(false);
+            mockIdentityRegistry.get.withArgs('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63').rejects();
             mockIdentityService.getName.returns('admin');
             mockIdentityService.getIssuer.returns('26341f1fc63f30886c54abeba3aca520601126ae2a57869d1ec1a3f854ebc417');
             let identity = factory.newResource('org.hyperledger.composer.system', 'Identity', '9f8b1a1e7280d40f4f14577ee4329473c60f04db3ea0f40c91f9684558c6ab50');
-            mockIdentityRegistry.exists.withArgs('9f8b1a1e7280d40f4f14577ee4329473c60f04db3ea0f40c91f9684558c6ab50').resolves(true);
             mockIdentityRegistry.get.withArgs('9f8b1a1e7280d40f4f14577ee4329473c60f04db3ea0f40c91f9684558c6ab50').resolves(identity);
             return identityManager.getIdentity()
                 .should.eventually.be.equal(identity);
         });
 
         it('should throw for an identity that does not exist', () => {
             mockIdentityService.getIdentifier.returns('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63');
-            mockIdentityRegistry.exists.withArgs('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63').resolves(false);
+            mockIdentityRegistry.get.withArgs('7d85a9672abea0dfa45705eed99a536b8470d192e2a17e50c1fb86cb4bccae63').rejects();
             mockIdentityService.getName.returns('admin');
             mockIdentityService.getIssuer.returns('26341f1fc63f30886c54abeba3aca520601126ae2a57869d1ec1a3f854ebc417');
-            mockIdentityRegistry.exists.withArgs('9f8b1a1e7280d40f4f14577ee4329473c60f04db3ea0f40c91f9684558c6ab50').resolves(false);
+            mockIdentityRegistry.get.withArgs('9f8b1a1e7280d40f4f14577ee4329473c60f04db3ea0f40c91f9684558c6ab50').rejects();
             return identityManager.getIdentity()
                 .should.be.rejectedWith(/The current identity has not been registered/);
         });