Renamed functions and routes

receive* -> announce*

szbk -> /v0/announce/zblock
szch -> /v0/announce/zchain

6 files changed, 44 insertions, 42 deletions

diff --git a/api/routes/receiveZBlock/index.js b/api/routes/announceZBlock/index.js
index 4f1ae3d..b395dbf 100644
--- a/api/routes/receiveZBlock/index.js
+++ b/api/routes/announceZBlock/index.js
@@ -14,7 +14,8 @@
  */
 const getvalidity = require('../../validators/ZblockValidator')
 module.exports = (req, res) => {
-    console.log("okay we got called")
+    console.log(req);
+    console.log("okay we got called");
     if ( (req.body.zblock) && req.body.zblock.length === 46 ){
         regex= /Qm[A-Za-z0-9]{44}/;
         if (regex.test(req.body.zblock)){
diff --git a/api/routes/receiveZChain/index.js b/api/routes/announceZChain/index.js
index a955b79..092b6a9 100644
--- a/api/routes/receiveZChain/index.js
+++ b/api/routes/announceZChain/index.js
@@ -35,6 +35,7 @@ function continuethingsNS(validitycode,sh,res,gotit){
 const getNSvalidity = require('../../validators/ZchainValidator')
 
 module.exports = (req, res) => {
+    console.log(req);
     if ( (req.body.zchain) && req.body.zchain.length === 62 ){//&& req.body.block_signature.length === 46){
         regex= /k51qzi5uqu5d[A-Za-z0-9]{50}/
         if (regex.test(req.body.zchain)){ // && regex.test(req.body.block_signature)){
diff --git a/api/routes/index.js b/api/routes/index.js
index cb3c584..f68e2e6 100644
--- a/api/routes/index.js
+++ b/api/routes/index.js
@@ -8,8 +8,8 @@ const getSLatest = require('./getSLatest');
 const getZLatest = require('./getZLatest');
 const getSBlock = require('./getSBlock');
 const getZChain = require('./getZChain');
-const receiveZBlock = require('./receiveZBlock');
-const receiveZChain = require('./receiveZChain');
+const announceZBlock = require('./announceZBlock');
+const announceZChain = require('./announceZChain');
 const getZblock = require('./getZblock');
 const getMrk = require('./getMrk');
 const getTr = require('./getTr');
@@ -53,9 +53,9 @@ router.route(settings.URL_PREFIX+'/mrk/:mrk').get(getMrk);
 // Returns a tr
 router.route(settings.URL_PREFIX+'/tr/:tr').get(getTr);
 // Send a block to the node (zchain block)
-router.route(settings.URL_PREFIX+'/sblk').post(receiveZBlock);
+router.route(settings.URL_PREFIX+'/announce/zblock').post(announceZBlock);
 // Send a zchain link to the node (refering to a valid zchain out there)
-router.route(settings.URL_PREFIX+'/szch').post(receiveZChain);
+router.route(settings.URL_PREFIX+'/announce/zchain').post(announceZChain);
 
 router.route('/*').get((req,res)=>{console.log(req.url);res.send({error:"404"})});
 router.route('/*').post((req,res)=>{console.log(req.url);res.send({error:"404"})});
diff --git a/api/tests/send_me_a_zblock.sh b/api/tests/announce_zblock.sh
index 73f514e..be34930 100755
--- a/api/tests/send_me_a_zblock.sh
+++ b/api/tests/announce_zblock.sh
@@ -2,7 +2,7 @@
 PROGRAM="$(basename $0)"
 printf '[%s]\n' "$PROGRAM"
 printf "\t01:\tendpoint with valid data"
-curl http://127.0.0.1:8610/v0/sblk --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak-get-zlatest)'"}' 2>/dev/null | jq -M -c > /dev/null
+curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak-get-zlatest)'"}' 2>/dev/null | jq -M -c > /dev/null
 if [ "$?" == "0" ]
 then
     printf "\t\t\033[0;32mPASSED\033[0;0m"
@@ -12,7 +12,7 @@ fi
 printf "\n"
 
 printf "\t02:\tendpoint with invalid data"
-curl http://127.0.0.1:8610/v0/sblk --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak-get-zlatest)'sdfas"}' 2>/dev/null | jq -M -c > /dev/null
+curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak-get-zlatest)'sdfas"}' 2>/dev/null | jq -M -c > /dev/null
 if [ "$?" == "0" ]
 then
     printf "\t\t\033[0;32mPASSED\033[0;0m"
@@ -22,7 +22,7 @@ fi
 printf "\n"
 
 printf "\t03:\tendpoint no data"
-curl http://127.0.0.1:8610/v0/sblk --header 'Content-Type: application/json' --data-raw '{"zblock":""}' 2>/dev/null | jq -M -c > /dev/null
+curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":""}' 2>/dev/null | jq -M -c > /dev/null
 if [ "$?" == "0" ]
 then
     printf "\t\t\033[0;32mPASSED\033[0;0m"
diff --git a/api/tests/announce_zchain_link.sh b/api/tests/announce_zchain_link.sh
new file mode 100755
index 0000000..f788f77
--- /dev/null
+++ b/api/tests/announce_zchain_link.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+PROGRAM="$(basename $0)"
+printf '[%s]\n' "$PROGRAM"
+printf "TEST\t/announce/zchain\n"
+# curl http://127.0.0.1:8610/v0/announce/zchain
+printf "\t01:\tendpoint with valid data"
+curl -POST http://localhost:8610/v0/announce/zchain --header 'Content-Type: application/json' --data-raw '{"zchain":"k51qzi5uqu5dgapvk7bhxmchuqya9immqdpbz0f1r91ckpdqzub63afn3d5apr"}' 2>/dev/null | jq -M -c > /dev/null
+if [ "$?" == "0" ]
+then
+    printf "\t\t\033[0;32mPASSED\033[0;0m"
+else
+    printf "\t\033[0;31mFAILED\033[0;0m"
+fi
+printf "\n"
+
+printf "\t02:\tendpoint with invalid data"
+curl -POST http://localhost:8610/v0/announce/zchain --header 'Content-Type: application/json' --data-raw '{"zchain":"k51qzi5uqu5dgapvk7bhxmchuqya9immqdpbz0f1r91ckpdqzub63afn3d5aar"}' 2>/dev/null | jq -M -c > /dev/null
+if [ "$?" == "0" ]
+then
+    printf "\t\t\033[0;32mPASSED\033[0;0m"
+else
+    printf "\t\033[0;31mFAILED\033[0;0m"
+fi
+printf "\n"
+
+printf "\t03:\tendpoint no data"
+curl -POST http://localhost:8610/v0/announce/zchain --header 'Content-Type: application/json' --data-raw '{"zchain":""}' 2>/dev/null | jq -M -c > /dev/null
+if [ "$?" == "0" ]
+then
+    printf "\t\t\033[0;32mPASSED\033[0;0m"
+else
+    printf "\t\033[0;31mFAILED\033[0;0m"
+fi
+printf "\n"
diff --git a/api/tests/send_me_a_zchain_link.sh b/api/tests/send_me_a_zchain_link.sh
deleted file mode 100755
index 15bc2a0..0000000
--- a/api/tests/send_me_a_zchain_link.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-PROGRAM="$(basename $0)"
-printf '[%s]\n' "$PROGRAM"
-printf "TEST\t/szch\n"
-# curl http://127.0.0.1:8610/v0/szch
-printf "\t01:\tendpoint with valid data"
-curl -POST http://localhost:8610/v0/szch --header 'Content-Type: application/json' --data-raw '{"zchain":"k51qzi5uqu5dgapvk7bhxmchuqya9immqdpbz0f1r91ckpdqzub63afn3d5apr"}' 2>/dev/null | jq -M -c > /dev/null
-if [ "$?" == "0" ]
-then
-    printf "\t\t\033[0;32mPASSED\033[0;0m"
-else
-    printf "\t\033[0;31mFAILED\033[0;0m"
-fi
-printf "\n"
-
-printf "\t02:\tendpoint with invalid data"
-curl -POST http://localhost:8610/v0/szch --header 'Content-Type: application/json' --data-raw '{"zchain":"k51qzi5uqu5dgapvk7bhxmchuqya9immqdpbz0f1r91ckpdqzub63afn3d5aar"}' 2>/dev/null | jq -M -c > /dev/null
-if [ "$?" == "0" ]
-then
-    printf "\t\t\033[0;32mPASSED\033[0;0m"
-else
-    printf "\t\033[0;31mFAILED\033[0;0m"
-fi
-printf "\n"
-
-printf "\t03:\tendpoint no data"
-curl -POST http://localhost:8610/v0/szch --header 'Content-Type: application/json' --data-raw '{"zchain":""}' 2>/dev/null | jq -M -c > /dev/null
-if [ "$?" == "0" ]
-then
-    printf "\t\t\033[0;32mPASSED\033[0;0m"
-else
-    printf "\t\033[0;31mFAILED\033[0;0m"
-fi
-printf "\n"