get rid of byte code argument to create_calldata

This means that there is less type checking at calldata creation time.
Make sure that we check that the function hash exists before calling
a contract!
This commit is contained in:
Ulf Norell
2019-02-26 17:31:53 +01:00
parent 5a4a84805f
commit e0fff00e64
2 changed files with 11 additions and 42 deletions
+5 -5
View File
@@ -12,7 +12,7 @@
, file/2
, from_string/2
, check_call/4
, create_calldata/4
, create_calldata/3
, version/0
, sophia_type_to_typerep/1
, to_sophia_value/4
@@ -271,13 +271,13 @@ translate_vm_value(VmTypes, {constr_t, _, Con, Types}, Args)
translate_vm_value(_VmType, _Type, _Data) ->
throw(cannot_translate_to_sophia).
-spec create_calldata(map(), string(), string(), [string()]) ->
-spec create_calldata(string(), string(), [string()]) ->
{ok, binary(), aeso_sophia:type(), aeso_sophia:type()}
| {error, argument_syntax_error}.
create_calldata(Contract, Code, Fun, Args) when is_map(Contract) ->
create_calldata(Code, Fun, Args) ->
case check_call(Code, Fun, Args, []) of
{ok, FunName, {ArgTypes, RetType}, Args} ->
aeso_abi:create_calldata(Contract, FunName, Args, ArgTypes, RetType);
{ok, FunName, {ArgTypes, RetType}, VMArgs} ->
aeso_abi:create_calldata(FunName, VMArgs, ArgTypes, RetType);
{error, _} = Err -> Err
end.