Merge branch 'topic/hardfork-v4' into feature/composable-transactions

aergoio · Jan 30, 2024 · 345092f · 345092f
2 parents 51d81fc + 60c5f75
commit 345092f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/tests/test-contract-deploy.sh b/tests/test-contract-deploy.sh
@@ -57,7 +57,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -74,7 +74,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -91,7 +91,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -108,7 +108,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
 
 
@@ -125,5 +125,5 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 #assert_equals "$gasUsed"  "117861"
diff --git a/tests/test-gas-bf.sh b/tests/test-gas-bf.sh
@@ -29,7 +29,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 
 if [ "$fork_version" -eq "4" ]; then
   assert_equals "$gasUsed"  "57105265"

diff --git a/tests/test-gas-deploy.sh b/tests/test-gas-deploy.sh
@@ -29,7 +29,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 
 if [ "$fork_version" -eq "4" ]; then
   assert_equals "$gasUsed"  "118350"

diff --git a/tests/test-gas-op.sh b/tests/test-gas-op.sh
@@ -29,7 +29,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 
 if [ "$fork_version" -eq "4" ]; then
   assert_equals "$gasUsed"  "130048"

diff --git a/tests/test-gas-per-function-v4.sh b/tests/test-gas-per-function-v4.sh
@@ -30,7 +30,7 @@ status=$(cat receipt.json | jq .status | sed 's/"//g')
 ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 
 assert_equals "$status" "SUCCESS"
-assert_equals "$ret"    "{}"
+assert_equals "$ret"    ""
 
 
 echo "-- get account's nonce --"

diff --git a/tests/test-gas-verify-proof.sh b/tests/test-gas-verify-proof.sh
@@ -29,7 +29,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 
 if [ "$fork_version" -eq "4" ]; then
   assert_equals "$gasUsed"  "160281"
@@ -51,7 +51,7 @@ ret=$(cat receipt.json | jq .ret | sed 's/"//g')
 gasUsed=$(cat receipt.json | jq .gasUsed | sed 's/"//g')
 
 assert_equals "$status"   "SUCCESS"
-#assert_equals "$ret"      "{}"
+#assert_equals "$ret"      ""
 
 if [ "$fork_version" -eq "4" ]; then
   assert_equals "$gasUsed"  "108404"