update test script to check output

Obsidian_Runtime/src/main/yul_templates/object.mustache

@@ -35,7 +35,6 @@ object "{{creationObject}}" {
 
             {{! todo: is 4 a magic number or should it be generated based on the object in question? check the ABI }}
             if iszero(lt(calldatasize(), 4)) {
-            {
                 {{#dispatch}}
                     {{! TODO 224 is a magic number offset to shift to follow the spec above; check that it's right }}
                     let selector := shr(224, calldataload(0))
@@ -95,5 +94,4 @@ object "{{creationObject}}" {
         {{runtimeSubObjects}}
     }
     {{subObjects}}
-}
 }

bin/run_obs_yul_all.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+
+# this is a wrapper on the run_obs_yul script, which produces yul for the ganache tests programs
+# without actually running them, that runs it on all of the test programs in a batch mode. it is
+# kind of a hack but it works for now and saves a rewrite of the run_obs_yul script.
+
+for f in $(run_obs_yul.sh | tail -n +2)
+do
+    echo "---------------------------"
+    echo $f
+    echo "---------------------------"
+    run_obs_yul.sh "$f"
+done

bin/skipped_tests.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# when run from the top level of the repo, this prints out the names of the obsidian files
+# in the ganache tests that do not also have a json file paired with them -- that means that
+# they won't be run by travis. this also appears in the output of the travis script at the very top.
+comm -13 <(ls resources/tests/GanacheTests/*.json | xargs basename -s '.json') <(ls resources/tests/GanacheTests/*.obs | xargs basename -s '.obs')

resources/tests/GanacheTests/AssignLocalAdd.json

@@ -2,5 +2,7 @@
     "gas" : 30000000,
     "gasprice" : "0x9184e72a000",
     "startingeth" : 5000000,
-    "numaccts" : 1
+    "numaccts" : 1,
+    "testexp" : "main()",
+    "expected" : "17"
 }

resources/tests/GanacheTests/AssignLocalAdd.obs

@@ -5,4 +5,9 @@ main contract AssignLocalAdd{
         x = 5 + 12;
         return;
     }
+
+    transaction main() returns int {
+        int x = 5 + 12;
+        return x;
+    }
 }

resources/tests/GanacheTests/BoolLiteral.json

@@ -2,5 +2,7 @@
     "gas" : 30000000,
     "gasprice" : "0x9184e72a000",
     "startingeth" : 5000000,
-    "numaccts" : 1
+    "numaccts" : 1,
+    "testexp" : "main()",
+    "expected" : "0"
 }

resources/tests/GanacheTests/BoolLiteral.obs

@@ -4,4 +4,8 @@ main contract BoolLiteral{
 	     x = true;
 	     x = false;
 	 }
+
+	 transaction main() returns bool {
+        return false;
+	 }
 }

resources/tests/GanacheTests/If.json

@@ -2,5 +2,7 @@
     "gas" : 30000000,
     "gasprice" : "0x9184e72a000",
     "startingeth" : 5000000,
-    "numaccts" : 1
+    "numaccts" : 1,
+    "testexp" : "main()",
+    "expected" : "1"
 }

resources/tests/GanacheTests/If.obs

@@ -2,8 +2,16 @@ main contract If {
         transaction iftest() {
             int x;
             if (true) {
-	       x = 1;
-	    }
+	           x = 1;
+	        }
             return;
         }
+
+        transaction main() returns int {
+            int x = 0;
+            if (true) {
+                x = 1;
+            }
+            return x;
+        }
 }

resources/tests/GanacheTests/IfThenElse.json

@@ -2,5 +2,7 @@
     "gas" : 30000000,
     "gasprice" : "0x9184e72a000",
     "startingeth" : 5000000,
-    "numaccts" : 1
+    "numaccts" : 1,
+    "testexp" : "main()",
+    "expected" : "90"
 }

resources/tests/GanacheTests/IfThenElse.obs

@@ -8,4 +8,14 @@ main contract IfThenElse {
 	        }
             return;
         }
+
+        transaction main() returns int {
+            int x = 9;
+            if (false) {
+	            x = 50;
+	        } else {
+	            x = 90;
+	        }
+            return x;
+        }
 }

resources/tests/GanacheTests/IntConst.json

@@ -2,5 +2,7 @@
     "gas" : 30000000,
     "gasprice" : "0x9184e72a000",
     "startingeth" : 5000000,
-    "numaccts" : 1
+    "numaccts" : 1,
+    "testexp" : "main()",
+    "expected" : "12"
 }

resources/tests/GanacheTests/IntConst.obs

@@ -1,7 +1,11 @@
 main contract IntConst{
         transaction intconst() {
             int x;
-            x = 4;
+            x = 12;
             return;
         }
+
+        transaction main() returns int {
+            return 12;
+        }
 }

resources/tests/GanacheTests/PrimOpsAdd.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsadd()",
+    "expected" : "13"
+}

resources/tests/GanacheTests/PrimOpsAdd.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsAdd{
+        transaction primopsadd() returns int {
+           return(5+8);
+        }
+}

resources/tests/GanacheTests/PrimOpsAnd.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsand()",
+    "expected" : "0"
+}

resources/tests/GanacheTests/PrimOpsAnd.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsAnd{
+        transaction primopsand() returns bool {
+           return(true && false);
+        }
+}

resources/tests/GanacheTests/PrimOpsDiv.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsdiv()",
+    "expected" : "2"
+}

resources/tests/GanacheTests/PrimOpsDiv.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsDiv{
+        transaction primopsdiv() returns int {
+           return(4/2);
+        }
+}

resources/tests/GanacheTests/PrimOpsEq.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopseq()",
+    "expected" : "0"
+}

resources/tests/GanacheTests/PrimOpsEq.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsEq{
+        transaction primopseq() returns bool {
+           return(5 == 9);
+        }
+}

resources/tests/GanacheTests/PrimOpsGreater.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsgreater()",
+    "expected" : "0"
+}

resources/tests/GanacheTests/PrimOpsGreater.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsGreater{
+        transaction primopsgreater() returns bool {
+           return(12 > 19);
+        }
+}

resources/tests/GanacheTests/PrimOpsGreaterEq.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsgreatereq()",
+    "expected" : "1"
+}

resources/tests/GanacheTests/PrimOpsGreaterEq.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsGreaterEq{
+        transaction primopsgreatereq() returns bool {
+           return(12 >= 12);
+        }
+}

resources/tests/GanacheTests/PrimOpsLess.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsless()",
+    "expected" : "1"
+}

resources/tests/GanacheTests/PrimOpsLess.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsLess{
+        transaction primopsless() returns bool {
+           return(9 < 10);
+        }
+}

resources/tests/GanacheTests/PrimOpsLessEq.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopslesseq()",
+    "expected" : "1"
+}

resources/tests/GanacheTests/PrimOpsLessEq.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsLessEq{
+        transaction primopslesseq() returns bool {
+           return(9 <= 19);
+        }
+}

resources/tests/GanacheTests/PrimOpsMod.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsmod()",
+    "expected" : "5"
+}

resources/tests/GanacheTests/PrimOpsMod.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsMod{
+        transaction primopsmod() returns int {
+           return(13 % 8);
+        }
+}

resources/tests/GanacheTests/PrimOpsMul.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsmul()",
+    "expected" : "20"
+}

resources/tests/GanacheTests/PrimOpsMul.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsMul{
+        transaction primopsmul() returns int {
+           return(5*4);
+        }
+}

resources/tests/GanacheTests/PrimOpsNEq.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsneq()",
+    "expected" : "1"
+}

resources/tests/GanacheTests/PrimOpsNEq.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsNEq{
+        transaction primopsneq() returns bool {
+           return(5 != 9);
+        }
+}

resources/tests/GanacheTests/PrimOpsNeg.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsNeg{
+        transaction primopsneg() returns int {
+           return(-20);
+        }
+}

resources/tests/GanacheTests/PrimOpsNotFalse.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsnotfalse()",
+    "expected" : "1"
+}

resources/tests/GanacheTests/PrimOpsNotFalse.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsNotFalse{
+        transaction primopsnotfalse() returns bool {
+           return(! false);
+        }
+}

resources/tests/GanacheTests/PrimOpsNotTrue.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsnottrue()",
+    "expected" : "0"
+}

resources/tests/GanacheTests/PrimOpsNotTrue.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsNotTrue{
+        transaction primopsnottrue() returns bool {
+           return(! true);
+        }
+}

resources/tests/GanacheTests/PrimOpsOr.json

@@ -0,0 +1,8 @@
+{
+    "gas" : 30000000,
+    "gasprice" : "0x9184e72a000",
+    "startingeth" : 5000000,
+    "numaccts" : 1,
+    "testexp" : "primopsor()",
+    "expected" : "1"
+}

resources/tests/GanacheTests/PrimOpsOr.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsOr{
+        transaction primopsor() returns bool {
+           return(true || false);
+        }
+}

resources/tests/GanacheTests/PrimOpsSubNeg.obs

@@ -0,0 +1,5 @@
+main contract PrimOpsSubNeg{
+        transaction primopssubneg() returns int {
+           return(5-20);
+        }
+}