PR tweaks for Tynes. Use getJSON util method, variable renaming

Author: wi-ski

lib/node/http.js

@@ -474,11 +474,13 @@ class HTTP extends Server {
         throw new Error('Invalid hash.');
 
       const ns = await this.chain.db.getNameState(hash);
+      const height = this.chain.tip.height;
+      const network = this.network;
 
       if (!ns)
         return res.json(404);
 
-      return res.json(200, { name: ns.name.toString('binary') });
+      return res.json(200, ns.getJSON(height,network));
     });
 
     this.get('/resource/name/:name', async (req, res) => {
@@ -496,7 +498,7 @@ class HTTP extends Server {
 
       const resource = Resource.decode(ns.data);
 
-      return res.json(200, resource.toJSON());
+      return res.json(200, resource.getJSON(name));
     });
 
     this.get('/proof/name/:name', async (req, res) => {
@@ -506,18 +508,18 @@ class HTTP extends Server {
       if (!name || !rules.verifyName(name))
         throw new Error('Invalid name.');
 
-      const hash = this.chain.tip.hash;
+      const tip = this.chain.tip.hash;
       const height = this.chain.tip.height;
       const root = this.chain.tip.treeRoot;
-      const key = rules.hashName(name);
-      const proof = await this.chain.db.prove(root, key);
+      const nameHash = rules.hashName(name);
+      const proof = await this.chain.db.prove(root, nameHash);
 
       return res.json(200, {
-        hash: hash.toString('hex'),
+        hash: tip.toString('hex'),
         height: height,
         root: root.toString('hex'),
         name: name,
-        key: key.toString('hex'),
+        key: nameHash.toString('hex'),
         proof: proof.toJSON()
       });
     });

test/node-http-test.js

@@ -169,7 +169,7 @@ describe('Node http', function() {
         await wclient.execute('sendupdate', [NAME0, records]);
         await mineBlocks(1);
         const resource = await nclient.get(`/resource/name/${NAME0}`);
-        assert.deepEqual(resource, records);
+        assert.deepEqual(resource, { ...records, name: NAME0, version: 0 });
       });
     });
   });