status-im/evmc
2
0
Fork 0
mirror of https://github.com/status-im/evmc.git synced 2025-02-24 00:48:09 +00:00
Code Issues Projects Releases Wiki Activity

go: Use evmc_make_result() in Host.Call()

Browse Source
This commit is contained in:
Paweł Bylica 2019-08-06 11:03:16 +02:00
parent 705a610b16
commit 229ae7328d
No known key found for this signature in database
GPG Key ID: 7A0C037434FE77EF
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bindings/go/evmc/host.c
View File

@ -7,13 +7,6 @@
#include <stdlib.h> #include <stdlib.h>
void evmc_go_free_result_output(const struct evmc_result* result)
{
free((void*)result->output_data);
}
/* Go does not support exporting functions with parameters with const modifiers, /* Go does not support exporting functions with parameters with const modifiers,
* so we have to cast function pointers to the function types defined in EVMC. * so we have to cast function pointers to the function types defined in EVMC.
* This disables any type checking of exported Go functions. To mitigate this * This disables any type checking of exported Go functions. To mitigate this

17
bindings/go/evmc/host.go
View File

@ -8,6 +8,7 @@ package evmc
#cgo CFLAGS: -I${SRCDIR}/.. -Wall -Wextra -Wno-unused-parameter #cgo CFLAGS: -I${SRCDIR}/.. -Wall -Wextra -Wno-unused-parameter
#include <evmc/evmc.h> #include <evmc/evmc.h>
#include <evmc/helpers.h>
struct extended_context struct extended_context
{ {
@ -15,8 +16,6 @@ struct extended_context
int64_t index; int64_t index;
}; };
void evmc_go_free_result_output(const struct evmc_result* result);
*/ */
import "C" import "C"
import ( import (
@ -224,18 +223,12 @@ func call(pCtx unsafe.Pointer, msg *C.struct_evmc_message) C.struct_evmc_result
statusCode = C.enum_evmc_status_code(err.(Error)) statusCode = C.enum_evmc_status_code(err.(Error))
} }
result := C.struct_evmc_result{} outputData := (*C.uint8_t)(nil)
result.status_code = statusCode
result.gas_left = C.int64_t(gasLeft)
result.create_address = evmcAddress(createAddr)
if len(output) > 0 { if len(output) > 0 {
// TODO: We could pass it directly to the caller without a copy. The caller should release it. Check depth. outputData = (*C.uint8_t)(&output[0])
cOutput := C.CBytes(output)
result.output_data = (*C.uint8_t)(cOutput)
result.output_size = C.size_t(len(output))
result.release = (C.evmc_release_result_fn)(C.evmc_go_free_result_output)
} }
result := C.evmc_make_result(statusCode, C.int64_t(gasLeft), outputData, C.size_t(len(output)))
result.create_address = evmcAddress(createAddr)
return result return result
} }