Skip to content

Specify return type in perform_trusted_operation #1500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clangenb merged 7 commits into from
Nov 30, 2023
Merged

Specify return type in perform_trusted_operation #1500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
abc7ace
specify return type in perform_trusted_operation
kziemianek Nov 20, 2023
aafb745
Merge branch 'master' into kz/perform-trusted-operation-return-type
kziemianek Nov 20, 2023
fab4bdb
reveiw suggestions
kziemianek Nov 21, 2023
149e017
fix evm code
kziemianek Nov 21, 2023
7e3a5de
remove comment
kziemianek Nov 21, 2023
7ecaf3f
Merge branch 'master' into kz/perform-trusted-operation-return-type
kziemianek Nov 28, 2023
3c87130
Merge branch 'master' into kz/perform-trusted-operation-return-type
kziemianek Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix evm code
  • Loading branch information
@kziemianek
kziemianek committed Nov 21, 2023
commit 149e017555043c99a10b7363c072fc7dceb98842
1 change: 0 additions & 1 deletion cli/src/evm/commands/evm_call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use crate::{
trusted_operation::perform_trusted_operation,
Cli, CliResult, CliResultOk,
};
use codec::Decode;
use ita_stf::{Index, TrustedCall, TrustedGetter};
use itp_stf_primitives::{
traits::TrustedCallSigning,
Expand Down
7 changes: 2 additions & 5 deletions cli/src/evm/commands/evm_command_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ macro_rules! get_layer_two_evm_nonce {
TrustedGetter::evm_nonce($signer_pair.public().into())
.sign(&KeyPair::Sr25519(Box::new($signer_pair.clone()))),
));
let res = perform_trusted_operation($cli, $trusted_args, &top).unwrap_or_default();
let nonce = match res {
Some(n) => Index::decode(&mut n.as_slice()).unwrap_or(0),
None => 0,
};
let res = perform_trusted_operation::<Index>($cli, $trusted_args, &top);
let nonce = res.ok().unwrap_or(0);
debug!("got evm nonce: {:?}", nonce);
nonce
}};
Expand Down
3 changes: 1 addition & 2 deletions cli/src/evm/commands/evm_create.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use crate::{
trusted_operation::perform_trusted_operation,
Cli, CliResult, CliResultOk,
};
use codec::Decode;
use ita_stf::{evm_helpers::evm_create_address, Index, TrustedCall, TrustedGetter};
use itp_stf_primitives::{
traits::TrustedCallSigning,
Expand Down Expand Up @@ -80,7 +79,7 @@ impl EvmCreateCommands {
.sign(&from.into(), nonce, &mrenclave, &shard)
.into_trusted_operation(trusted_args.direct);

let _ = perform_trusted_operation::<()>(cli, trusted_args, &top)?;
perform_trusted_operation::<()>(cli, trusted_args, &top)?;

let execution_address = evm_create_address(sender_evm_acc, evm_account_nonce);
info!("trusted call evm_create executed");
Expand Down
3 changes: 1 addition & 2 deletions cli/src/evm/commands/evm_read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use crate::{
trusted_cli::TrustedCli, trusted_command_utils::get_pair_from_str,
trusted_operation::perform_trusted_operation, Cli, CliError, CliResult, CliResultOk,
};
use codec::Decode;
use ita_stf::{Getter, TrustedCallSigned, TrustedGetter};
use itp_stf_primitives::types::{KeyPair, TrustedOperation};
use itp_types::AccountId;
Expand Down Expand Up @@ -58,7 +57,7 @@ impl EvmReadCommands {
));
match perform_trusted_operation::<H256>(cli, trusted_args, &top) {
Ok(hash) => {
println!("{:?}", vd);
println!("{:?}", hash);
Ok(CliResultOk::H256 { hash })
},
Err(e) => {
Expand Down