Skip to content

Extract a context variable in the IBC transaction handler #178

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
merged 1 commit into from
Feb 17, 2020
Merged

Extract a context variable in the IBC transaction handler #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions core/src/ibc/transaction_handler/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@ use rlp::{Decodable, Rlp};
pub fn execute(
bytes: &[u8],
state: &mut TopLevelState,
fee_payer: &Address,
_fee_payer: &Address,
_sender_public: &Public,
current_block_number: u64,
) -> StateResult<()> {
let mut context = ibc_context::TopLevelContext::new(state, current_block_number);
let datagram = Datagram::decode(&Rlp::new(bytes)).expect("Verification passed");
match datagram {
Datagram::CreateClient {
id,
kind,
consensus_state,
} => create_client(state, fee_payer, &id, kind, &consensus_state, current_block_number),
} => create_client(&mut context, &id, kind, &consensus_state),
Datagram::UpdateClient {
id,
header,
} => update_client(state, &id, &header, current_block_number),
} => update_client(&mut context, &id, &header),
Datagram::ConnOpenInit {
identifier,
desired_counterparty_connection_identifier,
counterparty_prefix,
client_identifier,
counterparty_client_identifier,
} => {
let mut context = ibc_context::TopLevelContext::new(state, current_block_number);
let connection_manager = ibc_connection::Manager::new();
connection_manager
.handle_open_init(
Expand Down Expand Up @@ -98,14 +98,11 @@ pub fn execute(


fn create_client(
state: &mut TopLevelState,
_fee_payer: &Address,
ctx: &mut dyn ibc::Context,
id: &str,
kind: ibc_client::Kind,
consensus_state: &[u8],
current_block_number: u64,
) -> StateResult<()> {
let mut context = ibc_context::TopLevelContext::new(state, current_block_number);
let client_manager = ibc_client::Manager::new();
if kind != ibc_client::KIND_FOUNDRY {
return Err(RuntimeError::IBC(format!("CreateClient has invalid type {}", kind)).into())
Expand All @@ -119,17 +116,16 @@ fn create_client(
};

client_manager
.create(&mut context, id, &foundry_consensus_state)
.create(ctx, id, &foundry_consensus_state)
.map_err(|err| RuntimeError::IBC(format!("CreateClient: {:?}", err)))?;
Ok(())
}

fn update_client(state: &mut TopLevelState, id: &str, header: &[u8], current_block_number: u64) -> StateResult<()> {
let mut context = ibc_context::TopLevelContext::new(state, current_block_number);
fn update_client(ctx: &mut dyn ibc::Context, id: &str, header: &[u8]) -> StateResult<()> {
let client_manager = ibc_client::Manager::new();
let client_state = client_manager.query(&mut context, id).map_err(RuntimeError::IBC)?;
let client_state = client_manager.query(ctx, id).map_err(RuntimeError::IBC)?;

client_state.update(&mut context, header).map_err(RuntimeError::IBC)?;
client_state.update(ctx, header).map_err(RuntimeError::IBC)?;

Ok(())
}