Skip to content

Commit

Permalink
Fixes rebase conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
grarco committed Nov 21, 2024
1 parent 94caa75 commit 73898d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions wasm_for_tests/tx_proposal_token_gas/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::BTreeMap;

use namada_tx_prelude::{
parameters_storage::get_gas_cost_key, token::Amount, *,
};
use namada_tx_prelude::parameters_storage::get_gas_cost_key;
use namada_tx_prelude::token::Amount;
use namada_tx_prelude::*;

#[transaction]
fn apply_tx(ctx: &mut Ctx, _tx_data: BatchedTx) -> TxResult {
Expand Down
2 changes: 1 addition & 1 deletion wasm_for_tests/vp_verify_signature/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ fn validate_tx(
_verifiers: BTreeSet<Address>,
) -> VpResult {
let mut gadget = VerifySigGadget::new();
gadget.verify_signatures(ctx, &tx_data.tx, &addr)
gadget.verify_signatures(ctx, &tx_data.tx, &tx_data.cmt, &addr)
}

0 comments on commit 73898d6

Please sign in to comment.