Merge pull request #4 from AdrienChampion/master

major fixes in `MustFail` + doc update + rmed all logging from techelson lib
OCamlPro · Mar 1, 2019 · fa2901c · fa2901c
2 parents 73d7bdf + 4dac830
commit fa2901c
Show file tree

Hide file tree

Showing 33 changed files with 953 additions and 435 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ A test execution engine for Michelson smart contracts.
 
 # Documentation
 
-The user documentation is hosted here: [liquidity-lang.org/techelson/doc]. You can also access the bleeding edge version on [the main repo's git page]. Finally, there is a blog post by Techelson's main developer on how to use Techelson with [Liquidity]: [adrienchampion.github.io/blog].
+The user documentation is hosted here [the main repository's github pages]. Finally, there is a blog post by Techelson's main developer on how to use Techelson with [Liquidity]: [adrienchampion.github.io/blog].
 
 # Features
 
@@ -65,7 +65,6 @@ For example
 [opam installed]: https://opam.ocaml.org/doc/Install.html
 [dune]: https://github.com/ocaml/dune
 [mdbook]: https://github.com/rust-lang-nursery/mdBook
-[liquidity-lang.org/techelson/doc]: http://www.liquidity-lang.org/techelson/doc
 [Liquidity]: http://www.liquidity-lang.org/
-[adrienchampion.github.io/blog]: https://adrienchampion.github.io/blog/tezos/techelson/with_liquidity/index.html
-[the main repo's git page]: https://ocamlpro.github.io/techelson/user_doc
+[adrienchampion.github.io/blog]: https://adrienchampion.github.io/blog
+[the main repository's github pages]: https://adrienchampion.github.io/blog/tezos/techelson/with_liquidity/index.html
diff --git a/docs/index.md b/docs/index.md
@@ -6,7 +6,7 @@ A test execution engine for Michelson smart contracts.
 
 # Documentation
 
-The user documentation is hosted here: [liquidity-lang.org/techelson/doc]. You can also access the bleeding edge version on [the main repo's git page]. Finally, there is a blog post by Techelson's main developer on how to use Techelson with [Liquidity]: [adrienchampion.github.io/blog].
+The user documentation is hosted here [the main repository's github pages]. Finally, there is a blog post by Techelson's main developer on how to use Techelson with [Liquidity]: [adrienchampion.github.io/blog].
 
 # Features
 
@@ -65,7 +65,6 @@ For example
 [opam installed]: https://opam.ocaml.org/doc/Install.html
 [dune]: https://github.com/ocaml/dune
 [mdbook]: https://github.com/rust-lang-nursery/mdBook
-[liquidity-lang.org/techelson/doc]: http://www.liquidity-lang.org/techelson/doc
 [Liquidity]: http://www.liquidity-lang.org/
-[adrienchampion.github.io/blog]: https://adrienchampion.github.io/blog/tezos/techelson/with_liquidity/index.html
-[the main repo's git page]: https://ocamlpro.github.io/techelson/user_doc
+[adrienchampion.github.io/blog]: https://adrienchampion.github.io/blog
+[the main repository's github pages]: https://adrienchampion.github.io/blog/tezos/techelson/with_liquidity/index.html
diff --git a/docs/user_doc/print.html b/docs/user_doc/print.html
@@ -921,7 +921,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:2] address[0]@Transfer -&gt; address[1]@main 13utz True
 =&gt; live contracts: SimpleExample (23utz) address[1]@main
 
-=&gt; live contracts: SimpleExample (23utz) address[1]@main
 
 running test script...
 stack:
@@ -1129,24 +1128,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 
 applying operation CREATE[uid:2] (@address[3]@admins, &quot;sha512:@contract_manager&quot;, None, false, true, 0utz) &quot;Admins&quot;
    live contracts: none
-=&gt; live contracts: Admins (0utz) address[3]@admins
-applying operation CREATE[uid:1] (@address[2]@new_admin, &quot;sha512:@new_admin_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: Admins (0utz) address[3]@admins
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-applying operation CREATE[uid:0] (@address[1]@root, &quot;sha512:@root_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
 =&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
@@ -1266,24 +1247,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 
 applying operation CREATE[uid:2] (@address[3]@admins, &quot;sha512:@contract_manager&quot;, None, false, true, 0utz) &quot;Admins&quot;
    live contracts: none
-=&gt; live contracts: Admins (0utz) address[3]@admins
-applying operation CREATE[uid:1] (@address[2]@new_admin, &quot;sha512:@new_admin_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: Admins (0utz) address[3]@admins
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-applying operation CREATE[uid:0] (@address[1]@root, &quot;sha512:@root_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
 =&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
@@ -1319,13 +1282,20 @@ <h1 class="menu-title">Techelson User Documentation</h1>
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
 
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-                   &lt;anonymous&gt; (0utz) address[1]@root
+failure confirmed on test operation
+  MUST_FAIL[uid:4] _ (TRANSFER[uid:3] address[0]@MustFail -&gt; address[3]@admins 0utz (&quot;root&quot;, (&quot;new_admin&quot;, address[2]@new_admin)))
+while running operation TRANSFER[uid:3] address[0]@MustFail -&gt; address[3]@admins 0utz (&quot;root&quot;, (&quot;new_admin&quot;, address[2]@new_admin))
+failed with value &quot;illegal access to admin account&quot; : string
 
 running test script...
 Done running test `MustFail`
 
+</code></pre>
+<p>Notice that Techelson lets you know the failure is confirmed:</p>
+<pre><code>failure confirmed on test operation
+  MUST_FAIL[uid:4] _ (TRANSFER[uid:3] address[0]@MustFail -&gt; address[3]@admins 0utz (&quot;root&quot;, (&quot;new_admin&quot;, address[2]@new_admin)))
+while running operation TRANSFER[uid:3] address[0]@MustFail -&gt; address[3]@admins 0utz (&quot;root&quot;, (&quot;new_admin&quot;, address[2]@new_admin))
+failed with value &quot;illegal access to admin account&quot; : string
 </code></pre>
 <a class="header" href="#more-precise-failure-testing" id="more-precise-failure-testing"><h2>(More) Precise Failure Testing</h2></a>
 <p>Now, <code>MUST_FAIL</code> (as it is used here) succeeds if the transfer ends in a <em>tezos protocol</em> failure.
@@ -1351,24 +1321,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 
 applying operation CREATE[uid:2] (@address[3]@admins, &quot;sha512:@contract_manager&quot;, None, false, true, 0utz) &quot;Admins&quot;
    live contracts: none
-=&gt; live contracts: Admins (0utz) address[3]@admins
-applying operation CREATE[uid:1] (@address[2]@new_admin, &quot;sha512:@new_admin_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: Admins (0utz) address[3]@admins
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-applying operation CREATE[uid:0] (@address[1]@root, &quot;sha512:@root_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
 =&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
@@ -1405,9 +1357,10 @@ <h1 class="menu-title">Techelson User Documentation</h1>
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
 
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-                   &lt;anonymous&gt; (0utz) address[1]@root
+failure confirmed on test operation
+  MUST_FAIL[uid:4] &quot;illegal access to admin account&quot; : string (TRANSFER[uid:3] address[0]@PreciseMustFail -&gt; address[3]@admins 0utz (&quot;root&quot;, (&quot;new_admin&quot;, address[2]@new_admin)))
+while running operation TRANSFER[uid:3] address[0]@PreciseMustFail -&gt; address[3]@admins 0utz (&quot;root&quot;, (&quot;new_admin&quot;, address[2]@new_admin))
+failed with value &quot;illegal access to admin account&quot; : string
 
 running test script...
 Done running test `PreciseMustFail`
@@ -1492,24 +1445,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 
 applying operation CREATE[uid:2] (@address[3]@admins, &quot;sha512:@contract_manager&quot;, None, false, true, 0utz) &quot;Admins&quot;
    live contracts: none
-=&gt; live contracts: Admins (0utz) address[3]@admins
-applying operation CREATE[uid:1] (@address[2]@new_admin, &quot;sha512:@new_admin_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: Admins (0utz) address[3]@admins
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-applying operation CREATE[uid:0] (@address[1]@root, &quot;sha512:@root_manager&quot;, None, true, true, 0utz) 
-                       {
-                           storage unit ;
-                           parameter unit ;
-                           code ...;
-                       }
-   live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
 =&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
@@ -1577,9 +1512,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
                    Admins (0utz) address[3]@admins
                    &lt;anonymous&gt; (0utz) address[1]@root
 
-=&gt; live contracts: &lt;anonymous&gt; (0utz) address[2]@new_admin
-                   Admins (0utz) address[3]@admins
-                   &lt;anonymous&gt; (0utz) address[1]@root
 
 running test script...
 Done running test `SetSource`
@@ -1636,7 +1568,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:1] address[0]@SimpleExampleTest1 -&gt; address[1] 120584798270008utz True
 =&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
-=&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
 running test script...
 Done running test `SimpleExampleTest1`
@@ -1888,7 +1819,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:1] address[0]@SimpleExampleTest1 -&gt; address[1] 120584798270008utz True
 =&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
-=&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
 running test script...
 Done running test `SimpleExampleTest1`
@@ -1908,7 +1838,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:1] address[2]@SimpleExampleTest2 -&gt; address[3] 520090578679187utz True
 =&gt; live contracts: SimpleExample (810126422944596utz) address[3]
 
-=&gt; live contracts: SimpleExample (810126422944596utz) address[3]
 
 running test script...
 
@@ -1918,7 +1847,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:2] address[2]@SimpleExampleTest2 -&gt; address[3] 845034275504874utz False
 =&gt; live contracts: SimpleExample (1655160698449470utz) address[3]
 
-=&gt; live contracts: SimpleExample (1655160698449470utz) address[3]
 
 running test script...
 Done running test `SimpleExampleTest2`

diff --git a/docs/user_doc/quick_ref/usage.html b/docs/user_doc/quick_ref/usage.html
@@ -198,7 +198,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:1] address[0]@SimpleExampleTest1 -&gt; address[1] 120584798270008utz True
 =&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
-=&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
 running test script...
 Done running test `SimpleExampleTest1`
@@ -218,7 +217,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:1] address[2]@SimpleExampleTest2 -&gt; address[3] 520090578679187utz True
 =&gt; live contracts: SimpleExample (810126422944596utz) address[3]
 
-=&gt; live contracts: SimpleExample (810126422944596utz) address[3]
 
 running test script...
 
@@ -228,7 +226,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:2] address[2]@SimpleExampleTest2 -&gt; address[3] 845034275504874utz False
 =&gt; live contracts: SimpleExample (1655160698449470utz) address[3]
 
-=&gt; live contracts: SimpleExample (1655160698449470utz) address[3]
 
 running test script...
 Done running test `SimpleExampleTest2`

diff --git a/docs/user_doc/searchindex.js b/docs/user_doc/searchindex.js
diff --git a/docs/user_doc/searchindex.json b/docs/user_doc/searchindex.json
diff --git a/docs/user_doc/testgen/example.html b/docs/user_doc/testgen/example.html
@@ -176,7 +176,6 @@ <h1 class="menu-title">Techelson User Documentation</h1>
 running TRANSFER[uid:1] address[0]@SimpleExampleTest1 -&gt; address[1] 120584798270008utz True
 =&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
-=&gt; live contracts: SimpleExample (759142736525198utz) address[1]
 
 running test script...
 Done running test `SimpleExampleTest1`