From e96c4d17839e81dc74a91c6a51e1ccce40c54b92 Mon Sep 17 00:00:00 2001
From: Robert Martin-Legene <robert@nic.ar>
Date: Thu, 2 Aug 2018 14:57:11 -0300
Subject: [PATCH] Renamed geth_exec_js to geth_exec_file
---
bin/create.contract | 2 +-
bin/insert.sh | 2 +-
bin/libbfa.sh | 2 +-
bin/maymine.sh | 2 +-
bin/rewind.sh | 2 +-
bin/tsa-insert.sh | 2 +-
bin/tsa-verify.sh | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/create.contract b/bin/create.contract
index e75d2f3..f7a36c0 100755
--- a/bin/create.contract
+++ b/bin/create.contract
@@ -35,7 +35,7 @@ EOT
echo '*** Creating contract. This will take at least 16 seconds.'
outfile=$( mktemp )
cleanup "$outfile"
- geth_exec_js $js > $outfile
+ geth_exec_file $js > $outfile
if [ ` wc -l < $outfile ` = 2 -a `tail -1 < $outfile` = "true" ]
then
addr=` head -1 < $outfile `
diff --git a/bin/insert.sh b/bin/insert.sh
index c52dda0..dba01ef 100755
--- a/bin/insert.sh
+++ b/bin/insert.sh
@@ -37,7 +37,7 @@ console.log ( thecontract.put.sendTransaction( "${sum}", {from: eth.accounts[0],
EOT
out=$( mktemp )
cleanup "$out"
-geth_exec_js "${js}" > ${out}
+geth_exec_file "${js}" > ${out}
if [ ` wc -l < ${out} ` = 2 -a ` tail -1 < ${out} ` = "true" ]
then
trans=` head -1 < ${out} `
diff --git a/bin/libbfa.sh b/bin/libbfa.sh
index 7c125c3..d4147ca 100644
--- a/bin/libbfa.sh
+++ b/bin/libbfa.sh
@@ -43,7 +43,7 @@ function geth_attach
$cat | geth --cache 0 "$@" attach ipc:${BFANODEDIR}/geth.ipc
}
-function geth_exec_js
+function geth_exec_file
{
test -r "$1"
if echo $- | grep -q x && [ -t 1 ]
diff --git a/bin/maymine.sh b/bin/maymine.sh
index 426d6cb..fae1155 100755
--- a/bin/maymine.sh
+++ b/bin/maymine.sh
@@ -5,7 +5,7 @@ if [ -z "${BFAHOME}" ]; then echo "\$BFAHOME not set. Did you source bfa/bin/env
source ${BFAHOME}/bin/libbfa.sh || exit 1
bfaconfig node
-res=$( geth_exec_js "${BFAHOME}/src/js.maymine" )
+res=$( geth_exec_file "${BFAHOME}/src/js.maymine" )
if [ "$res" = "true" ]
then
diff --git a/bin/rewind.sh b/bin/rewind.sh
index ff4c62b..c4d6529 100755
--- a/bin/rewind.sh
+++ b/bin/rewind.sh
@@ -3,4 +3,4 @@
if [ -z "${BFAHOME}" ]; then echo "\$BFAHOME not set. Did you source bfa/bin/env ?" >&2; exit 1; fi
source ${BFAHOME}/bin/libbfa.sh || exit 1
-geth_exec_js ${BFAHOME}/src/js.rewind
+geth_exec_file ${BFAHOME}/src/js.rewind
diff --git a/bin/tsa-insert.sh b/bin/tsa-insert.sh
index cd29cb7..1509e6d 100755
--- a/bin/tsa-insert.sh
+++ b/bin/tsa-insert.sh
@@ -29,7 +29,7 @@ console.log( thecontract.put.sendTransaction( [${hashes}], {from: eth.accounts[0
EOT
out=$( mktemp )
cleanup "$out"
-geth_exec_js "${js}" > ${out}
+geth_exec_file "${js}" > ${out}
if [ ` wc -l < ${out} ` = 2 -a ` tail -1 < ${out} ` = "true" ]
then
trans=` head -1 < ${out} `
diff --git a/bin/tsa-verify.sh b/bin/tsa-verify.sh
index 390ebcc..c2a055d 100755
--- a/bin/tsa-verify.sh
+++ b/bin/tsa-verify.sh
@@ -25,7 +25,7 @@ console.log( thecontract.get.call( [${hashes}], {from: eth.accounts[0], gas: 100
EOT
out=$( mktemp )
cleanup "$out"
-geth_exec_js "${js}" > ${out}
+geth_exec_file "${js}" > ${out}
if [ ` wc -l < ${out} ` = 2 -a ` tail -1 < ${out} ` = "true" ]
then
block=` head -1 < $out `
--
GitLab