Refactoring

2 files changed, 20 insertions, 72 deletions

diff --git a/api/routes/getMrk/index.js b/api/routes/getMrk/index.js
index 35a0a2d..92f8c1e 100644
--- a/api/routes/getMrk/index.js
+++ b/api/routes/getMrk/index.js
@@ -1,4 +1,3 @@
-const { spawn } = require('child_process');
 const fs = require("fs");
 const config = require("../../config");
 
@@ -10,39 +9,18 @@ const config = require("../../config");
  *
  */
 function fetchFmrk(mrk, res){
-    const command = spawn("cat",[config.workDir+"/fmrk/"+mrk]);
     res.set('Content-Type', 'application/json');
-    command.stdout.on("data", data => {
-    });
-
-    command.stderr.on("data", data => {
-            console.log(`stderr: ${data}`);
-    });
-
-    command.on('error', (error) => {
-            console.log(`error: ${error.message}`);
-    });
-
-    command.on("close", code => {
-        console.log(`child process exited with code ${code}`);
-
-        if ( code === 0 ) {
-            const path = config.workDir+"/fmrk/"+mrk;
-            console.log(path)
-            try {
-                if(fs.existsSync(path)){
-                    res.send(fs.readFileSync(path));
-                }
-            } catch (error) {
-                res.send({"error":error.message});
-            }
-        } else if ( code === 2){
-            res.send({"error":"The roof is on fire"});
-        } else {
-            res.send({"error":"invalid or unreachable"});
+    const path = config.workDir+"/fmrk/"+mrk;
+    // console.log(path)
+    try {
+        if(fs.existsSync(path)){
+            res.send(fs.readFileSync(path));
         }
-    });
+    } catch (error) {
+        res.send({"error":error.message});
+    }
 };
+
 module.exports = (req, res) => {
     console.log(req.params)
     res.set('Content-Type', 'application/json');
@@ -50,11 +28,7 @@ module.exports = (req, res) => {
         regex= /[a-f0-9]{128}/;
         if (regex.test(req.params.mrk)){
             let mrk = req.params.mrk;
-            if (mrk === "QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH" ){
-                res.send({error:"Genesis block"});
-            } else {
-                fetchFmrk(mrk,res);
-            }
+            fetchFmrk(mrk,res);
         } else {
             res.send({error:"Invalid data: regexp failed to pass"});
         }
diff --git a/api/routes/getTr/index.js b/api/routes/getTr/index.js
index 5701f52..25f0c6d 100644
--- a/api/routes/getTr/index.js
+++ b/api/routes/getTr/index.js
@@ -10,39 +10,17 @@ const config = require("../../config");
  *
  */
 function fetchFtr(tr, res){
-    const command = spawn("cat",[config.workDir+"/ftr/"+tr]);
-    command.stdout.on("data", data => {
-    });
-
-    command.stderr.on("data", data => {
-            console.log(`stderr: ${data}`);
-    });
-
-    command.on('error', (error) => {
-            console.log(`error: ${error.message}`);
-    });
-
-    command.on("close", code => {
-        console.log(`child process exited with code ${code}`);
-        res.set('Content-Type', 'application/json');
-
-        if ( code === 0 ) {
-            const path = config.workDir+"/ftr/"+tr;
-            console.log(path)
-            try {
-                if(fs.existsSync(path)){
-                    res.send(fs.readFileSync(path));
-                }
-            } catch (error) {
-                res.send({"error":error.message});
-            }
-        } else if ( code === 2){
-            res.send({"error":"The roof is on fire"});
-        } else {
-            res.send({"error":"invalid or unreachable"});
+    res.set('Content-Type', 'application/json');
+    const path = config.workDir+"/ftr/"+tr;
+    try {
+        if(fs.existsSync(path)){
+            res.send(fs.readFileSync(path));
         }
-    });
+    } catch (error) {
+        res.send({"error":error.message});
+    }
 };
+
 module.exports = (req, res) => {
     console.log(req.params)
     res.set('Content-Type', 'application/json');
@@ -50,11 +28,7 @@ module.exports = (req, res) => {
         regex= /[a-f0-9]{128}/;
         if (regex.test(req.params.tr)){
             let tr = req.params.tr;
-            if (tr === "QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH" ){
-                res.send({error:"Genesis block"});
-            } else {
-                fetchFtr(tr,res);
-            }
+            fetchFtr(tr,res);
         } else {
             res.send({error:"Invalid data: regexp failed to pass"});
         }