Address review, fix some dialyzer errors

test/aeso_aci_tests.erl

@@ -103,17 +103,24 @@ aci_test_contract(Name) ->
                  true  -> [debug_mode];
                  false -> []
              end ++ [{include, {file_system, [aeso_test_utils:contract_path()]}}],
-    {ok, JSON} = aeso_aci:contract_interface(json, String, Opts),
-    {ok, #{aci := JSON1}} = aeso_compiler:from_string(String, [{aci, json}, {backend, fate} | Opts]),
-    ?assertEqual(JSON, JSON1),
+    JSON = case aeso_aci:contract_interface(json, String, Opts) of
+               {ok, J} -> J;
+               {error, ErrorStringJ} when is_binary(ErrorStringJ) -> error(ErrorStringJ);
+               {error, ErrorJ} -> aeso_compiler_tests:print_and_throw(ErrorJ)
+           end,
+    case aeso_compiler:from_string(String, [{aci, json}, {backend, fate} | Opts]) of
+        {ok, #{aci := JSON1}} ->
+            ?assertEqual(JSON, JSON1),
+            io:format("JSON:\n~p\n", [JSON]),
+            {ok, ContractStub} = aeso_aci:render_aci_json(JSON),
 
-    io:format("JSON:\n~p\n", [JSON]),
-    {ok, ContractStub} = aeso_aci:render_aci_json(JSON),
+            io:format("STUB:\n~s\n", [ContractStub]),
+            check_stub(ContractStub, [{src_file, Name}]),
 
-    io:format("STUB:\n~s\n", [ContractStub]),
-    check_stub(ContractStub, [{src_file, Name}]),
-
-    ok.
+            ok;
+        {error, ErrorString} when is_binary(ErrorString) -> error(ErrorString);
+        {error, Error} -> aeso_compiler_tests:print_and_throw(Error)
+    end.
 
 check_stub(Stub, Options) ->
     try aeso_parser:string(binary_to_list(Stub), Options) of

test/aeso_compiler_tests.erl

@@ -34,9 +34,7 @@ simple_compile_test_() ->
                #{fate_code := Code} when Backend == fate ->
                    Code1 = aeb_fate_code:deserialize(aeb_fate_code:serialize(Code)),
                    ?assertMatch({X, X}, {Code1, Code});
-               ErrBin ->
-                   io:format("\n~s", [ErrBin]),
-                   error(ErrBin)
+               Error -> print_and_throw(Error)
            end
        end} || ContractName <- compilable_contracts(), Backend <- [aevm, fate],
                not lists:member(ContractName, not_compilable_on(Backend))] ++
@@ -878,14 +876,26 @@ validation_fails() ->
          "Byte code contract is not payable, but source code contract is.">>]}].
 
 validate(Contract1, Contract2) ->
-    ByteCode = #{ fate_code := FCode } = compile(fate, Contract1),
-    FCode1   = aeb_fate_code:serialize(aeb_fate_code:strip_init_function(FCode)),
-    Source   = aeso_test_utils:read_contract(Contract2),
-    aeso_compiler:validate_byte_code(
-      ByteCode#{ byte_code := FCode1 }, Source,
-      case lists:member(Contract2, debug_mode_contracts()) of
-          true  -> [debug_mode];
-          false -> []
-      end ++
-      [{backend, fate}, {include, {file_system, [aeso_test_utils:contract_path()]}}]).
+    case compile(fate, Contract1) of
+        ByteCode = #{ fate_code := FCode } ->
+            FCode1   = aeb_fate_code:serialize(aeb_fate_code:strip_init_function(FCode)),
+            Source   = aeso_test_utils:read_contract(Contract2),
+            aeso_compiler:validate_byte_code(
+              ByteCode#{ byte_code := FCode1 }, Source,
+              case lists:member(Contract2, debug_mode_contracts()) of
+                  true  -> [debug_mode];
+                  false -> []
+              end ++
+                  [{backend, fate}, {include, {file_system, [aeso_test_utils:contract_path()]}}]);
+        Error -> print_and_throw(Error)
+    end.
 
+print_and_throw(Err) ->
+    case Err of
+        ErrBin when is_binary(ErrBin) ->
+            io:format("\n~s", [ErrBin]),
+            error(ErrBin);
+        Errors ->
+            io:format("Compilation error:\n~s", [string:join([aeso_errors:pp(E) || E <- Errors], "\n\n")]),
+            error(compilation_error)
+    end.

test/contracts/clone.aes

@@ -14,7 +14,7 @@ main contract C =
     let s1 = Chain.clone(ref=s)
     let Some(s2) = Chain.clone(ref=s, protected=true)
     let None = Chain.clone(ref=s, protected=true, gas=1)
-    let None = Chain.clone(ref=l, protected=true, 123)
+    let None = Chain.clone(ref=l, protected=true, 123) // since it should be HigherOrderState underneath
     let s3 = Chain.clone(ref=s1)
     require(s1.apply(2137) == 2137, "APPLY_S1_0")
     require(s2.apply(2137) == 2137, "APPLY_S2_0")

test/contracts/test.aes

@@ -1,3 +1,6 @@
+// This is a custom test file if you need to run a compiler without
+// changing aeso_compiler_tests.erl
+
 include "List.aes"
 
 contract IntegerHolder =
@@ -5,10 +8,5 @@ contract IntegerHolder =
   entrypoint init(x) = x
   entrypoint get() = state
 
-main contract IntegerCollection =
-  record state = {template: IntegerHolder, payload: list(IntegerHolder)}
-  stateful entrypoint init() = {template = Chain.create(0), payload = []}
-  stateful entrypoint add(x) =
-    put(state{payload @ p = Chain.clone(ref=state.template, x) :: p})
-    x
-  entrypoint sum() = List.sum(List.map((h) => h.get(), state.payload))
+main contract Test =
+  stateful entrypoint f(c) = Chain.clone(ref=c, 123)