Skip to content

Commit

Permalink
refactor(has_perm): changes return and removes params
Browse files Browse the repository at this point in the history
- adds bool/int32 return to acc_has_perm functions
- removes unnecessary params on acc_has_perm functions
  • Loading branch information
emersonfbarros committed Jul 31, 2024
1 parent f9b5053 commit 910c1a2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion c-api/libvmexeccapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ typedef struct {
void (*managed_get_code_metadata_func_ptr)(void *context, int32_t address_handle, int32_t response_handle);
int32_t (*managed_is_builtin_function_func_ptr)(void *context, int32_t function_name_handle);
void (*managed_get_sft_metadata_func_ptr)(void *context, int32_t ticker_handle, int64_t nonce, int32_t data_handle);
void (*managed_acc_has_perm_func_ptr)(void *context, int64_t threshold, int32_t source_acc_addr, int32_t target_acc_addr, int32_t res_handle);
int32_t (*managed_acc_has_perm_func_ptr)(void *context, int64_t ops, int32_t source_acc_addr, int32_t target_acc_addr);
int32_t (*big_float_new_from_parts_func_ptr)(void *context, int32_t integral_part, int32_t fractional_part, int32_t exponent);
int32_t (*big_float_new_from_frac_func_ptr)(void *context, int64_t numerator, int64_t denominator);
int32_t (*big_float_new_from_sci_func_ptr)(void *context, int64_t significand, int64_t exponent);
Expand Down
2 changes: 1 addition & 1 deletion c-api/src/capi_vm_hook_pointers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub struct vm_exec_vm_hook_c_func_pointers {
pub managed_get_code_metadata_func_ptr: extern "C" fn(context: *mut c_void, address_handle: i32, response_handle: i32),
pub managed_is_builtin_function_func_ptr: extern "C" fn(context: *mut c_void, function_name_handle: i32) -> i32,
pub managed_get_sft_metadata_func_ptr: extern "C" fn(context: *mut c_void, ticker_handle: i32, nonce: i64, data_handle: i32),
pub managed_acc_has_perm_func_ptr: extern "C" fn(context: *mut c_void, threshold: i64, source_acc_addr: i32, target_acc_addr: i32, res_handle: i32),
pub managed_acc_has_perm_func_ptr: extern "C" fn(context: *mut c_void, ops: i64, source_acc_addr: i32, target_acc_addr: i32) -> i32,
pub big_float_new_from_parts_func_ptr: extern "C" fn(context: *mut c_void, integral_part: i32, fractional_part: i32, exponent: i32) -> i32,
pub big_float_new_from_frac_func_ptr: extern "C" fn(context: *mut c_void, numerator: i64, denominator: i64) -> i32,
pub big_float_new_from_sci_func_ptr: extern "C" fn(context: *mut c_void, significand: i64, exponent: i64) -> i32,
Expand Down
4 changes: 2 additions & 2 deletions c-api/src/capi_vm_hooks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ impl klever_chain_vm_executor::VMHooks for CapiVMHooks {
(self.c_func_pointers_ptr.managed_get_sft_metadata_func_ptr)(self.vm_hooks_ptr, ticker_handle, nonce, data_handle)
}

fn managed_acc_has_perm(&self, threshold: i64, source_acc_addr: i32, target_acc_addr: i32, res_handle: i32) {
(self.c_func_pointers_ptr.managed_acc_has_perm_func_ptr)(self.vm_hooks_ptr, threshold, source_acc_addr, target_acc_addr, res_handle)
fn managed_acc_has_perm(&self, ops: i64, source_acc_addr: i32, target_acc_addr: i32) -> i32 {
(self.c_func_pointers_ptr.managed_acc_has_perm_func_ptr)(self.vm_hooks_ptr, ops, source_acc_addr, target_acc_addr)
}

fn big_float_new_from_parts(&self, integral_part: i32, fractional_part: i32, exponent: i32) -> i32 {
Expand Down
4 changes: 2 additions & 2 deletions vm-executor-wasmer/src/wasmer_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ fn wasmer_import_managed_get_sft_metadata(env: &VMHooksWrapper, ticker_handle: i
}

#[rustfmt::skip]
fn wasmer_import_managed_acc_has_perm(env: &VMHooksWrapper, threshold: i64, source_acc_addr: i32, target_acc_addr: i32, res_handle: i32) {
env.vm_hooks.managed_acc_has_perm(threshold, source_acc_addr, target_acc_addr, res_handle)
fn wasmer_import_managed_acc_has_perm(env: &VMHooksWrapper, ops: i64, source_acc_addr: i32, target_acc_addr: i32) -> i32 {
env.vm_hooks.managed_acc_has_perm(ops, source_acc_addr, target_acc_addr)
}

#[rustfmt::skip]
Expand Down
5 changes: 3 additions & 2 deletions vm-executor/src/vm_hooks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pub trait VMHooks: core::fmt::Debug + 'static {
fn managed_get_code_metadata(&self, address_handle: i32, response_handle: i32);
fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32;
fn managed_get_sft_metadata(&self, ticker_handle: i32, nonce: i64, data_handle: i32);
fn managed_acc_has_perm(&self, threshold: i64, source_acc_addr: i32, target_acc_addr: i32, res_handle: i32);
fn managed_acc_has_perm(&self, ops: i64, source_acc_addr: i32, target_acc_addr: i32) -> i32;
fn big_float_new_from_parts(&self, integral_part: i32, fractional_part: i32, exponent: i32) -> i32;
fn big_float_new_from_frac(&self, numerator: i64, denominator: i64) -> i32;
fn big_float_new_from_sci(&self, significand: i64, exponent: i64) -> i32;
Expand Down Expand Up @@ -714,8 +714,9 @@ impl VMHooks for VMHooksDefault {
println!("Called: managed_get_sft_metadata");
}

fn managed_acc_has_perm(&self, threshold: i64, source_acc_addr: i32, target_acc_addr: i32, res_handle: i32) {
fn managed_acc_has_perm(&self, ops: i64, source_acc_addr: i32, target_acc_addr: i32) -> i32 {
println!("Called: managed_acc_has_perm");
0
}

fn big_float_new_from_parts(&self, integral_part: i32, fractional_part: i32, exponent: i32) -> i32 {
Expand Down

0 comments on commit 910c1a2

Please sign in to comment.