From 3ab8a99969ba7d7b384390b608eb9ad6f5a43752 Mon Sep 17 00:00:00 2001 From: kaotisk Date: Wed, 17 Jul 2024 09:05:37 +0300 Subject: ak zchain: --get-latest (removing ak-get-zlatest) --- api/make_cache.sh | 2 +- api/routes/getZLatest/index.js | 2 +- api/tests/announce_zblock.sh | 4 ++-- api/tests/node_local_zlatest.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'api') diff --git a/api/make_cache.sh b/api/make_cache.sh index 71e80ca..e5f9bfc 100755 --- a/api/make_cache.sh +++ b/api/make_cache.sh @@ -1,5 +1,5 @@ #!/bin/bash ak-find-latest-mined-sblock > $AK_CACHEDIR/ak-find-latest-mined-sblock.json ak zchain --crawl > $AK_CACHEDIR/ak-get-chain-minified.json -ak-get-zlatest > $AK_CACHEDIR/ak-get-zlatest.json +ak zchain --get-latest > $AK_CACHEDIR/ak-get-zlatest.json diff --git a/api/routes/getZLatest/index.js b/api/routes/getZLatest/index.js index 9141a4e..3fdd88c 100644 --- a/api/routes/getZLatest/index.js +++ b/api/routes/getZLatest/index.js @@ -10,7 +10,7 @@ const { spawn } = require('child_process'); */ function getZLatest(req, res) { - const command = spawn("ak-get-zlatest"); + const command = spawn("ak-zchain", ["--get-latest"]); var buffer = ""; command.stdout.on("data", data => { buffer += data; diff --git a/api/tests/announce_zblock.sh b/api/tests/announce_zblock.sh index 15caec8..11572c0 100755 --- a/api/tests/announce_zblock.sh +++ b/api/tests/announce_zblock.sh @@ -3,7 +3,7 @@ PROGRAM="$(basename $0)" printf '[%s]\n' "$PROGRAM" printf "TEST\t/v0/announce/zblock\n" printf "\t01:\tendpoint with valid data" -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 +curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak zchain --get-latest)'"}' 2>/dev/null | jq -M -c > /dev/null if [ $? -eq 0 ] then printf "\t\t\033[0;32mPASSED\033[0;0m" @@ -13,7 +13,7 @@ fi printf "\n" printf "\t02:\tendpoint with invalid data" -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 +curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak zchain --get-latest)'sdfas"}' 2>/dev/null | jq -M -c > /dev/null if [ $? -eq 0 ] then printf "\t\t\033[0;32mPASSED\033[0;0m" diff --git a/api/tests/node_local_zlatest.sh b/api/tests/node_local_zlatest.sh index b470f1d..aaf2681 100755 --- a/api/tests/node_local_zlatest.sh +++ b/api/tests/node_local_zlatest.sh @@ -2,7 +2,7 @@ PROGRAM="$(basename $0)" printf '[%s]\n' "$PROGRAM" API_RES="$(curl http://127.0.0.1:8610/v0/zlatest 2>/dev/null | sha512sum - | awk '{ printf $1 }')" -CMD_RES="$(ak-get-zlatest | sed -e 's/^/{"zlatest":"/; s/$/"}/' | sha512sum - | awk '{ printf $1 }')" +CMD_RES="$(ak zchain --get-latest | sed -e 's/^/{"zlatest":"/; s/$/"}/' | sha512sum - | awk '{ printf $1 }')" printf "TEST /zlatest\n" printf "\t01:\tLatest is the same between API response and CLI..." if [ "$API_RES" == "$CMD_RES" ] -- cgit v1.2.3