QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Rename type_defs to typedefs in ACI to increase compatibility

Browse Source
This commit is contained in:
Denis Davidyuk 2022-10-27 19:32:57 +02:00
parent 09638daa90
commit f4e0b56cfb
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
``` ```
- Return a mapping from variables to FATE registers in the compilation output. - Return a mapping from variables to FATE registers in the compilation output.
### Changed ### Changed
- Type definitions serialised to ACI as `typedefs` field instead of `type_defs` to increase compatibility.
### Removed ### Removed
### Fixed ### Fixed

4
docs/aeso_aci.md
View File

@ -67,7 +67,7 @@ generates the following JSON structure representing the contract interface:
} }
] ]
}, },
"type_defs": [ "typedefs": [
{ {
"name": "answers", "name": "answers",
"typedef": { "typedef": {
@ -138,7 +138,7 @@ be included inside another contract.
state => state =>
#{record => #{record =>
[#{name => <<"a">>,type => <<"Answers.answers">>}]}, [#{name => <<"a">>,type => <<"Answers.answers">>}]},
type_defs => typedefs =>
[#{name => <<"answers">>, [#{name => <<"answers">>,
typedef => #{<<"map">> => [<<"string">>,<<"int">>]}, typedef => #{<<"map">> => [<<"string">>,<<"int">>]},
vars => []}]}}]} vars => []}]}}]}

8
src/aeso_aci.erl
View File

@ -91,7 +91,7 @@ encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HE
{Es, Tdefs1} = lists:partition(FilterT(<<"event">>), Tdefs0), {Es, Tdefs1} = lists:partition(FilterT(<<"event">>), Tdefs0),
{Ss, Tdefs} = lists:partition(FilterT(<<"state">>), Tdefs1), {Ss, Tdefs} = lists:partition(FilterT(<<"state">>), Tdefs1),
C1 = C0#{type_defs => Tdefs}, C1 = C0#{typedefs => Tdefs},
C2 = case Es of C2 = case Es of
[] -> C1; [] -> C1;
@ -111,7 +111,7 @@ encode_contract(Contract = {Head, _, {con, _, Name}, _, _}) when ?IS_CONTRACT_HE
encode_contract(Namespace = {namespace, _, {con, _, Name}, _}) -> encode_contract(Namespace = {namespace, _, {con, _, Name}, _}) ->
Tdefs = [ encode_typedef(T) || T <- sort_decls(contract_types(Namespace)) ], Tdefs = [ encode_typedef(T) || T <- sort_decls(contract_types(Namespace)) ],
#{namespace => #{name => encode_name(Name), #{namespace => #{name => encode_name(Name),
type_defs => Tdefs}}. typedefs => Tdefs}}.
%% Encode a function definition. Currently we are only interested in %% Encode a function definition. Currently we are only interested in
%% the interface and type. %% the interface and type.
@ -234,7 +234,7 @@ do_render_aci_json(Json) ->
decode_contract(#{contract := #{name := Name, decode_contract(#{contract := #{name := Name,
kind := Kind, kind := Kind,
payable := Payable, payable := Payable,
type_defs := Ts0, typedefs := Ts0,
functions := Fs} = C}) -> functions := Fs} = C}) ->
MkTDef = fun(N, T) -> #{name => N, vars => [], typedef => T} end, MkTDef = fun(N, T) -> #{name => N, vars => [], typedef => T} end,
Ts = [ MkTDef(<<"state">>, maps:get(state, C)) || maps:is_key(state, C) ] ++ Ts = [ MkTDef(<<"state">>, maps:get(state, C)) || maps:is_key(state, C) ] ++
@ -246,7 +246,7 @@ decode_contract(#{contract := #{name := Name,
end, end,
io_lib:format("~s", [Name])," =\n", io_lib:format("~s", [Name])," =\n",
decode_tdefs(Ts), decode_funcs(Fs)]; decode_tdefs(Ts), decode_funcs(Fs)];
decode_contract(#{namespace := #{name := Name, type_defs := Ts}}) when Ts /= [] -> decode_contract(#{namespace := #{name := Name, typedefs := Ts}}) when Ts /= [] ->
["namespace ", io_lib:format("~s", [Name])," =\n", ["namespace ", io_lib:format("~s", [Name])," =\n",
decode_tdefs(Ts)]; decode_tdefs(Ts)];
decode_contract(_) -> []. decode_contract(_) -> [].

6
test/aeso_aci_tests.erl
View File

@ -21,7 +21,7 @@ test_cases(1) ->
" payable stateful entrypoint a(i : int) = i+1\n">>, " payable stateful entrypoint a(i : int) = i+1\n">>,
MapACI = #{contract => MapACI = #{contract =>
#{name => <<"C">>, #{name => <<"C">>,
type_defs => [], typedefs => [],
payable => true, payable => true,
kind => contract_main, kind => contract_main,
functions => functions =>
@ -43,7 +43,7 @@ test_cases(2) ->
MapACI = #{contract => MapACI = #{contract =>
#{name => <<"C">>, payable => false, #{name => <<"C">>, payable => false,
kind => contract_main, kind => contract_main,
type_defs => typedefs =>
[#{name => <<"allan">>, [#{name => <<"allan">>,
typedef => <<"int">>, typedef => <<"int">>,
vars => []}], vars => []}],
@ -76,7 +76,7 @@ test_cases(3) ->
name => <<"C">>, payable => false, kind => contract_main, name => <<"C">>, payable => false, kind => contract_main,
event => #{variant => [#{<<"SingleEventDefined">> => []}]}, event => #{variant => [#{<<"SingleEventDefined">> => []}]},
state => <<"unit">>, state => <<"unit">>,
type_defs => typedefs =>
[#{name => <<"bert">>, [#{name => <<"bert">>,
typedef => typedef =>
#{variant => #{variant =>