diff --git a/apps/src/lib/node/ledger/shell/init_chain.rs b/apps/src/lib/node/ledger/shell/init_chain.rs index 45015ca48b..e3139fca48 100644 --- a/apps/src/lib/node/ledger/shell/init_chain.rs +++ b/apps/src/lib/node/ledger/shell/init_chain.rs @@ -231,10 +231,9 @@ where } else { // TODO: what write actions are desired here? self.wl_storage - .write_bytes( + .write( &namada::eth_bridge::storage::active_key(), - EthBridgeStatus::Disabled.serialize_to_vec(), - WriteActions::All, + EthBridgeStatus::Disabled, ) .unwrap(); } diff --git a/apps/src/lib/node/ledger/shell/mod.rs b/apps/src/lib/node/ledger/shell/mod.rs index b297502f6a..ab4a0cfb77 100644 --- a/apps/src/lib/node/ledger/shell/mod.rs +++ b/apps/src/lib/node/ledger/shell/mod.rs @@ -1552,7 +1552,7 @@ mod test_utils { use namada::ledger::parameters::{EpochDuration, Parameters}; use namada::ledger::storage::mockdb::MockDB; use namada::ledger::storage::{LastBlock, Sha256Hasher}; - use namada::ledger::storage_api::{StorageWrite, WriteActions}; + use namada::ledger::storage_api::StorageWrite; use namada::proof_of_stake::parameters::PosParams; use namada::proof_of_stake::storage::validator_consensus_key_handle; use namada::proto::{Code, Data}; @@ -2034,11 +2034,7 @@ mod test_utils { use namada::eth_bridge::storage::eth_bridge_queries::EthBridgeStatus; shell .wl_storage - .write_bytes( - &active_key(), - EthBridgeStatus::Disabled.serialize_to_vec(), - WriteActions::All, - ) + .write(&active_key(), EthBridgeStatus::Disabled) .expect("Test failed"); } diff --git a/benches/txs.rs b/benches/txs.rs index 65cb710d4c..605ce314ba 100644 --- a/benches/txs.rs +++ b/benches/txs.rs @@ -647,7 +647,8 @@ fn become_validator(c: &mut Criterion) { || { let mut shell = BenchShell::default(); // Initialize the account to be able to use it - // TODO: what write actions are desired here?? + // TODO: what write actions are desired here?? can this be turn + // into `write` from `write_bytes` anyway? shell .wl_storage .write_bytes( diff --git a/core/src/ledger/parameters/mod.rs b/core/src/ledger/parameters/mod.rs index 6b5e8e7ab9..810aa63c68 100644 --- a/core/src/ledger/parameters/mod.rs +++ b/core/src/ledger/parameters/mod.rs @@ -358,8 +358,6 @@ where S: StorageRead + StorageWrite, { let key = storage::get_max_signatures_per_transaction_key(); - // Using `fn write_bytes` here, because implicit_vp doesn't need to be - // encoded, it's bytes already. storage.write(&key, value) } diff --git a/ethereum_bridge/src/protocol/transactions/ethereum_events/events.rs b/ethereum_bridge/src/protocol/transactions/ethereum_events/events.rs index abaa41bd8c..1ea5e6bf5c 100644 --- a/ethereum_bridge/src/protocol/transactions/ethereum_events/events.rs +++ b/ethereum_bridge/src/protocol/transactions/ethereum_events/events.rs @@ -590,8 +590,6 @@ mod tests { }; use namada_core::ledger::storage::mockdb::MockDBWriteBatch; use namada_core::ledger::storage::testing::TestWlStorage; - use namada_core::ledger::storage::types::encode; - use namada_core::ledger::storage_api::WriteActions; use namada_core::types::address::testing::gen_implicit_address; use namada_core::types::address::{gen_established_address, nam, wnam}; use namada_core::types::eth_bridge_pool::GasFee; @@ -616,11 +614,7 @@ mod tests { .expect("Test failed"); // set native ERC20 token wl_storage - .write_bytes( - &bridge_storage::native_erc20_key(), - encode(&wnam()), - WriteActions::All, - ) + .write(&bridge_storage::native_erc20_key(), wnam()) .expect("Test failed"); } @@ -767,11 +761,7 @@ mod tests { let payer_balance = Amount::from(0); // TODO: decide what write actions are needed wl_storage - .write_bytes( - &payer_key, - payer_balance.serialize_to_vec(), - WriteActions::All, - ) + .write(&payer_key, payer_balance) .expect("Test failed"); let escrow_key = balance_key(&transfer.gas_fee.token, &BRIDGE_POOL_ADDRESS); @@ -787,21 +777,13 @@ mod tests { let sender_balance = Amount::from(0); // TODO: decide what write actions are needed wl_storage - .write_bytes( - &sender_key, - sender_balance.serialize_to_vec(), - WriteActions::All, - ) + .write(&sender_key, sender_balance) .expect("Test failed"); let escrow_key = balance_key(&nam(), &BRIDGE_ADDRESS); let escrow_balance = Amount::from(10); // TODO: decide what write actions are needed wl_storage - .write_bytes( - &escrow_key, - escrow_balance.serialize_to_vec(), - WriteActions::All, - ) + .write(&escrow_key, escrow_balance) .expect("Test failed"); } else { let token = transfer.token_address(); @@ -809,21 +791,13 @@ mod tests { let sender_balance = Amount::from(0); // TODO: decide what write actions are needed wl_storage - .write_bytes( - &sender_key, - sender_balance.serialize_to_vec(), - WriteActions::All, - ) + .write(&sender_key, sender_balance) .expect("Test failed"); let escrow_key = balance_key(&token, &BRIDGE_POOL_ADDRESS); let escrow_balance = Amount::from(10); // TODO: decide what write actions are needed wl_storage - .write_bytes( - &escrow_key, - escrow_balance.serialize_to_vec(), - WriteActions::All, - ) + .write(&escrow_key, escrow_balance) .expect("Test failed"); update::amount( wl_storage, diff --git a/ethereum_bridge/src/protocol/transactions/read.rs b/ethereum_bridge/src/protocol/transactions/read.rs index 9a4c38ef1e..d85453463d 100644 --- a/ethereum_bridge/src/protocol/transactions/read.rs +++ b/ethereum_bridge/src/protocol/transactions/read.rs @@ -55,9 +55,8 @@ where #[cfg(test)] mod tests { use assert_matches::assert_matches; - use borsh_ext::BorshSerializeExt; use namada_core::ledger::storage::testing::TestWlStorage; - use namada_core::ledger::storage_api::{StorageWrite, WriteActions}; + use namada_core::ledger::storage_api::StorageWrite; use namada_core::types::storage; use namada_core::types::token::Amount; @@ -80,9 +79,7 @@ mod tests { let key = storage::Key::parse("some arbitrary key").unwrap(); let amount = Amount::from(1_000_000); let mut fake_storage = TestWlStorage::default(); - fake_storage - .write_bytes(&key, amount.serialize_to_vec(), WriteActions::All) - .unwrap(); + fake_storage.write(&key, amount).unwrap(); let amt = read::amount_or_default(&fake_storage, &key).unwrap(); assert_eq!(amt, amount); @@ -93,9 +90,7 @@ mod tests { let key = storage::Key::parse("some arbitrary key").unwrap(); let amount = "not an Amount type"; let mut fake_storage = TestWlStorage::default(); - fake_storage - .write_bytes(&key, amount.as_bytes(), WriteActions::All) - .unwrap(); + fake_storage.write(&key, amount).unwrap(); assert_matches!(read::amount_or_default(&fake_storage, &key), Err(_)); } diff --git a/ethereum_bridge/src/protocol/transactions/update.rs b/ethereum_bridge/src/protocol/transactions/update.rs index 038e077147..03f74ff260 100644 --- a/ethereum_bridge/src/protocol/transactions/update.rs +++ b/ethereum_bridge/src/protocol/transactions/update.rs @@ -2,7 +2,7 @@ use borsh::{BorshDeserialize, BorshSerialize}; use eyre::Result; use namada_core::ledger::storage::{DBIter, StorageHasher, WlStorage, DB}; -use namada_core::ledger::storage_api::{StorageWrite, WriteActions}; +use namada_core::ledger::storage_api::StorageWrite; use namada_core::types::storage; use namada_core::types::token::Amount; @@ -19,7 +19,7 @@ where let mut amount = super::read::amount_or_default(wl_storage, key)?; update(&mut amount); // TODO: what kind of write actions are desired here? - wl_storage.write_bytes(key, borsh::to_vec(&amount)?, WriteActions::All)?; + wl_storage.write(key, amount)?; Ok(amount) } @@ -37,19 +37,16 @@ where let mut value = super::read::value(wl_storage, key)?; update(&mut value); // TODO: what kind of write actions are desired here? - wl_storage.write_bytes(key, borsh::to_vec(&value)?, WriteActions::All)?; + wl_storage.write(key, &value)?; Ok(value) } #[cfg(test)] mod tests { use borsh::BorshDeserialize; - use borsh_ext::BorshSerializeExt; use eyre::{eyre, Result}; use namada_core::ledger::storage::testing::TestWlStorage; - use namada_core::ledger::storage_api::{ - StorageRead, StorageWrite, WriteActions, - }; + use namada_core::ledger::storage_api::{StorageRead, StorageWrite}; use namada_core::types::storage; #[test] @@ -59,9 +56,8 @@ mod tests { .expect("could not set up test"); let value = 21i32; let mut wl_storage = TestWlStorage::default(); - let serialized = value.serialize_to_vec(); wl_storage - .write_bytes(&key, serialized, WriteActions::All) + .write(&key, value) .expect("could not set up test"); super::value(&mut wl_storage, &key, |v: &mut i32| *v *= 2)?; diff --git a/ethereum_bridge/src/protocol/transactions/votes/storage.rs b/ethereum_bridge/src/protocol/transactions/votes/storage.rs index 36504a455b..1fa44c6377 100644 --- a/ethereum_bridge/src/protocol/transactions/votes/storage.rs +++ b/ethereum_bridge/src/protocol/transactions/votes/storage.rs @@ -1,13 +1,10 @@ use borsh::{BorshDeserialize, BorshSerialize}; -use borsh_ext::BorshSerializeExt; use eyre::{Result, WrapErr}; use namada_core::hints; use namada_core::ledger::storage::{ DBIter, PrefixIter, StorageHasher, WlStorage, DB, }; -use namada_core::ledger::storage_api::{ - StorageRead, StorageWrite, WriteActions, -}; +use namada_core::ledger::storage_api::{StorageRead, StorageWrite}; use namada_core::types::storage::Key; use namada_core::types::voting_power::FractionalVotingPower; @@ -28,32 +25,15 @@ where { // TODO: figure out what specific write actions are desired for each piece // of data here! - wl_storage.write_bytes( - &keys.body(), - &body.serialize_to_vec(), - WriteActions::All, - )?; - wl_storage.write_bytes( - &keys.seen(), - &tally.seen.serialize_to_vec(), - WriteActions::All, - )?; - wl_storage.write_bytes( - &keys.seen_by(), - &tally.seen_by.serialize_to_vec(), - WriteActions::All, - )?; - wl_storage.write_bytes( - &keys.voting_power(), - &tally.voting_power.serialize_to_vec(), - WriteActions::All, - )?; + wl_storage.write(&keys.body(), body)?; + wl_storage.write(&keys.seen(), tally.seen)?; + wl_storage.write(&keys.seen_by(), tally.seen_by.clone())?; + wl_storage.write(&keys.voting_power(), tally.voting_power.clone())?; if !already_present { // add the current epoch for the inserted event - wl_storage.write_bytes( + wl_storage.write( &keys.voting_started_epoch(), - &wl_storage.storage.get_current_epoch().0.serialize_to_vec(), - WriteActions::All, + wl_storage.storage.get_current_epoch().0, )?; } Ok(()) @@ -158,6 +138,7 @@ mod tests { use std::collections::BTreeMap; use assert_matches::assert_matches; + use borsh_ext::BorshSerializeExt; use namada_core::types::ethereum_events::EthereumEvent; use super::*; @@ -259,39 +240,16 @@ mod tests { seen_by: BTreeMap::from([(validator, 10.into())]), seen: false, }; + wl_storage.write(&keys.body(), &event).unwrap(); + wl_storage.write(&keys.seen(), tally.seen).unwrap(); + wl_storage.write(&keys.seen_by(), &tally.seen_by).unwrap(); wl_storage - .write_bytes( - &keys.body(), - &event.serialize_to_vec(), - WriteActions::All, - ) - .unwrap(); - wl_storage - .write_bytes( - &keys.seen(), - &tally.seen.serialize_to_vec(), - WriteActions::All, - ) - .unwrap(); - wl_storage - .write_bytes( - &keys.seen_by(), - &tally.seen_by.serialize_to_vec(), - WriteActions::All, - ) - .unwrap(); - wl_storage - .write_bytes( - &keys.voting_power(), - &tally.voting_power.serialize_to_vec(), - WriteActions::All, - ) + .write(&keys.voting_power(), &tally.voting_power) .unwrap(); wl_storage - .write_bytes( + .write( &keys.voting_started_epoch(), - &wl_storage.storage.get_block_height().0.serialize_to_vec(), - WriteActions::All, + wl_storage.storage.get_block_height().0, ) .unwrap(); diff --git a/ethereum_bridge/src/storage/parameters.rs b/ethereum_bridge/src/storage/parameters.rs index dba2041675..d0191c1ed6 100644 --- a/ethereum_bridge/src/storage/parameters.rs +++ b/ethereum_bridge/src/storage/parameters.rs @@ -5,11 +5,8 @@ use borsh::{BorshDeserialize, BorshSerialize}; use eyre::{eyre, Result}; use namada_core::ledger::eth_bridge::storage::whitelist; use namada_core::ledger::storage; -use namada_core::ledger::storage::types::encode; use namada_core::ledger::storage::WlStorage; -use namada_core::ledger::storage_api::{ - StorageRead, StorageWrite, WriteActions, -}; +use namada_core::ledger::storage_api::{StorageRead, StorageWrite}; use namada_core::types::ethereum_events::EthAddress; use namada_core::types::ethereum_structs; use namada_core::types::storage::Key; @@ -195,39 +192,18 @@ impl EthereumBridgeParams { // TODO: figure out what kind of write actions are desired here for each // piece of data! wl_storage - .write_bytes( + .write( &active_key, - encode(&EthBridgeStatus::Enabled(EthBridgeEnabled::AtGenesis)), - WriteActions::All, - ) - .unwrap(); - wl_storage - .write_bytes( - &min_confirmations_key, - encode(min_confirmations), - WriteActions::All, - ) - .unwrap(); - wl_storage - .write_bytes( - &native_erc20_key, - encode(native_erc20), - WriteActions::All, + EthBridgeStatus::Enabled(EthBridgeEnabled::AtGenesis), ) .unwrap(); wl_storage - .write_bytes( - &bridge_contract_key, - encode(bridge), - WriteActions::All, - ) + .write(&min_confirmations_key, min_confirmations) .unwrap(); + wl_storage.write(&native_erc20_key, native_erc20).unwrap(); + wl_storage.write(&bridge_contract_key, bridge).unwrap(); wl_storage - .write_bytes( - ð_start_height_key, - encode(eth_start_height), - WriteActions::All, - ) + .write(ð_start_height_key, eth_start_height) .unwrap(); for Erc20WhitelistEntry { token_address: addr, @@ -249,27 +225,21 @@ impl EthereumBridgeParams { suffix: whitelist::KeyType::Whitelisted, } .into(); - wl_storage - .write_bytes(&key, encode(&true), WriteActions::All) - .unwrap(); + wl_storage.write(&key, true).unwrap(); let key = whitelist::Key { asset: *addr, suffix: whitelist::KeyType::Cap, } .into(); - wl_storage - .write_bytes(&key, encode(&cap), WriteActions::All) - .unwrap(); + wl_storage.write(&key, cap).unwrap(); let key = whitelist::Key { asset: *addr, suffix: whitelist::KeyType::Denomination, } .into(); - wl_storage - .write_bytes(&key, encode(&denom), WriteActions::All) - .unwrap(); + wl_storage.write(&key, denom).unwrap(); } // Initialize the storage for the Ethereum Bridge VP. vp::ethereum_bridge::init_storage(wl_storage); @@ -397,9 +367,9 @@ where #[cfg(test)] mod tests { - use borsh_ext::BorshSerializeExt; use eyre::Result; use namada_core::ledger::storage::testing::TestWlStorage; + use namada_core::ledger::storage_api::WriteActions; use namada_core::types::ethereum_events::EthAddress; use super::*; @@ -496,18 +466,16 @@ mod tests { fn test_ethereum_bridge_config_storage_partially_configured() { let mut wl_storage = TestWlStorage::default(); wl_storage - .write_bytes( + .write( &bridge_storage::active_key(), - encode(&EthBridgeStatus::Enabled(EthBridgeEnabled::AtGenesis)), - WriteActions::All, + EthBridgeStatus::Enabled(EthBridgeEnabled::AtGenesis), ) .unwrap(); // Write a valid min_confirmations value wl_storage - .write_bytes( + .write( &bridge_storage::min_confirmations_key(), - MinimumConfirmations::default().serialize_to_vec(), - WriteActions::All, + MinimumConfirmations::default(), ) .unwrap(); diff --git a/ethereum_bridge/src/storage/vp/ethereum_bridge.rs b/ethereum_bridge/src/storage/vp/ethereum_bridge.rs index 85eacd8025..d74ccc7943 100644 --- a/ethereum_bridge/src/storage/vp/ethereum_bridge.rs +++ b/ethereum_bridge/src/storage/vp/ethereum_bridge.rs @@ -1,6 +1,5 @@ -use borsh_ext::BorshSerializeExt; use namada_core::ledger::storage::{self as ledger_storage, StorageHasher}; -use namada_core::ledger::storage_api::{StorageWrite, WriteActions}; +use namada_core::ledger::storage_api::StorageWrite; use namada_core::types::token::{balance_key, Amount}; /// Initialize the storage owned by the Ethereum Bridge VP. @@ -17,14 +16,8 @@ where &namada_core::ledger::eth_bridge::ADDRESS, ); // TODO: what write actions are desired here? - wl_storage - .write_bytes( - &escrow_key, - Amount::default().serialize_to_vec(), - WriteActions::All, - ) - .expect( - "Initializing the escrow balance of the Ethereum Bridge VP \ - shouldn't fail.", - ); + wl_storage.write(&escrow_key, Amount::default()).expect( + "Initializing the escrow balance of the Ethereum Bridge VP shouldn't \ + fail.", + ); } diff --git a/sdk/src/queries/shell/eth_bridge.rs b/sdk/src/queries/shell/eth_bridge.rs index a4af02a53f..6226e666af 100644 --- a/sdk/src/queries/shell/eth_bridge.rs +++ b/sdk/src/queries/shell/eth_bridge.rs @@ -845,7 +845,7 @@ mod test_ethbridge_router { }; use namada_core::ledger::eth_bridge::storage::whitelist; use namada_core::ledger::storage::mockdb::MockDBWriteBatch; - use namada_core::ledger::storage_api::{StorageWrite, WriteActions}; + use namada_core::ledger::storage_api::StorageWrite; use namada_core::types::address::nam; use namada_core::types::address::testing::established_address_1; use namada_core::types::eth_abi::Encode; @@ -1082,11 +1082,7 @@ mod test_ethbridge_router { client.wl_storage.storage.block.height = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer), &transfer) .expect("Test failed"); // commit the changes and increase block height @@ -1126,11 +1122,7 @@ mod test_ethbridge_router { // write a transfer into the bridge pool client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer), &transfer) .expect("Test failed"); // commit the changes and increase block height @@ -1146,11 +1138,7 @@ mod test_ethbridge_router { transfer2.transfer.amount = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer2), - transfer2.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer2), &transfer2) .expect("Test failed"); // commit the changes and increase block height @@ -1193,11 +1181,7 @@ mod test_ethbridge_router { // write a transfer into the bridge pool client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer), &transfer) .expect("Test failed"); // create a signed Merkle root for this pool @@ -1216,20 +1200,15 @@ mod test_ethbridge_router { transfer2.transfer.amount = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer2), - transfer2.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer2), transfer2) .expect("Test failed"); // add the signature for the pool at the previous block height client .wl_storage - .write_bytes( + .write( &get_signed_root_key(), - (signed_root.clone(), written_height).serialize_to_vec(), - WriteActions::All, + (signed_root.clone(), written_height), ) .expect("Test failed"); @@ -1312,11 +1291,7 @@ mod test_ethbridge_router { // write a transfer into the bridge pool client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write_without_merkl(&get_pending_key(&transfer), &transfer) .expect("Test failed"); // create a signed Merkle root for this pool @@ -1338,21 +1313,13 @@ mod test_ethbridge_router { transfer2.transfer.amount = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer2), - transfer2.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer2), &transfer2) .expect("Test failed"); // add the signature for the pool at the previous block height client .wl_storage - .write_bytes( - &get_signed_root_key(), - (signed_root, BlockHeight::from(0)).serialize_to_vec(), - WriteActions::All, - ) + .write(&get_signed_root_key(), (signed_root, BlockHeight::from(0))) .expect("Test failed"); // commit the changes and increase block height @@ -1410,11 +1377,7 @@ mod test_ethbridge_router { // write a transfer into the bridge pool client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer), &transfer) .expect("Test failed"); // create a signed Merkle root for this pool @@ -1433,21 +1396,13 @@ mod test_ethbridge_router { transfer2.transfer.amount = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer2), - transfer2.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer2), transfer2) .expect("Test failed"); // add the signature for the pool at the previous block height client .wl_storage - .write_bytes( - &get_signed_root_key(), - (signed_root, written_height).serialize_to_vec(), - WriteActions::All, - ) + .write(&get_signed_root_key(), (signed_root, written_height)) .expect("Test failed"); // commit the changes and increase block height @@ -1488,11 +1443,7 @@ mod test_ethbridge_router { // write a transfer into the bridge pool client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer), &transfer) .expect("Test failed"); let event_transfer: namada_core::types::ethereum_events::TransferToEthereum @@ -1506,22 +1457,16 @@ mod test_ethbridge_router { let voting_power = FractionalVotingPower::HALF; client .wl_storage - .write_bytes( - ð_msg_key.body(), - eth_event.serialize_to_vec(), - WriteActions::All, - ) + .write(ð_msg_key.body(), eth_event) .expect("Test failed"); client .wl_storage - .write_bytes( + .write( ð_msg_key.voting_power(), EpochedVotingPower::from([( 0.into(), voting_power * dummy_validator_stake, - )]) - .serialize_to_vec(), - WriteActions::All, + )]), ) .expect("Test failed"); client @@ -1541,11 +1486,7 @@ mod test_ethbridge_router { transfer2.transfer.amount = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer2), - transfer2.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer2), transfer2) .expect("Test failed"); // commit the changes and increase block height @@ -1594,11 +1535,7 @@ mod test_ethbridge_router { // write a transfer into the bridge pool client .wl_storage - .write_bytes( - &get_pending_key(&transfer), - transfer.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer), &transfer) .expect("Test failed"); // create a signed Merkle root for this pool @@ -1617,21 +1554,13 @@ mod test_ethbridge_router { transfer2.transfer.amount = 1.into(); client .wl_storage - .write_bytes( - &get_pending_key(&transfer2), - transfer2.serialize_to_vec(), - WriteActions::All, - ) + .write(&get_pending_key(&transfer2), transfer2) .expect("Test failed"); // add the signature for the pool at the previous block height client .wl_storage - .write_bytes( - &get_signed_root_key(), - (signed_root, written_height).serialize_to_vec(), - WriteActions::All, - ) + .write(&get_signed_root_key(), (signed_root, written_height)) .expect("Test failed"); // commit the changes and increase block height diff --git a/shared/src/ledger/native_vp/ethereum_bridge/bridge_pool_vp.rs b/shared/src/ledger/native_vp/ethereum_bridge/bridge_pool_vp.rs index 0a6a43d1d6..d7f26d2db8 100644 --- a/shared/src/ledger/native_vp/ethereum_bridge/bridge_pool_vp.rs +++ b/shared/src/ledger/native_vp/ethereum_bridge/bridge_pool_vp.rs @@ -645,7 +645,6 @@ mod test_bridge_pool_vp { use borsh_ext::BorshSerializeExt; use namada_core::ledger::eth_bridge::storage::bridge_pool::get_signed_root_key; use namada_core::ledger::gas::TxGasMeter; - use namada_core::ledger::storage_api::WriteActions; use namada_core::types::address; use namada_ethereum_bridge::storage::parameters::{ Contracts, EthereumBridgeParams, UpgradeableContract, @@ -1623,21 +1622,13 @@ mod test_bridge_pool_vp { let eb_account_key = balance_key(&nam(), &Address::Internal(InternalAddress::EthBridge)); wl_storage - .write_bytes( - &eb_account_key, - Amount::default().serialize_to_vec(), - WriteActions::All, - ) + .write(&eb_account_key, Amount::default()) .expect("Test failed"); // initialize the gas payers account let gas_payer_balance_key = balance_key(&nam(), &established_address_1()); wl_storage - .write_bytes( - &gas_payer_balance_key, - Amount::from(BERTHA_WEALTH).serialize_to_vec(), - WriteActions::All, - ) + .write(&gas_payer_balance_key, Amount::from(BERTHA_WEALTH)) .expect("Test failed"); wl_storage.write_log.commit_tx(); let tx = Tx::from_type(TxType::Raw); diff --git a/shared/src/ledger/native_vp/ethereum_bridge/vp.rs b/shared/src/ledger/native_vp/ethereum_bridge/vp.rs index e00f25f4b5..237c9ff418 100644 --- a/shared/src/ledger/native_vp/ethereum_bridge/vp.rs +++ b/shared/src/ledger/native_vp/ethereum_bridge/vp.rs @@ -169,7 +169,7 @@ mod tests { use namada_core::ledger::eth_bridge::storage::bridge_pool::BRIDGE_POOL_ADDRESS; use namada_core::ledger::eth_bridge::storage::wrapped_erc20s; use namada_core::ledger::gas::TxGasMeter; - use namada_core::ledger::storage_api::{StorageWrite, WriteActions}; + use namada_core::ledger::storage_api::StorageWrite; use namada_ethereum_bridge::storage::parameters::{ Contracts, EthereumBridgeParams, UpgradeableContract, }; @@ -217,11 +217,9 @@ mod tests { &Address::decode(ARBITRARY_OWNER_A_ADDRESS).expect("Test failed"), ); wl_storage - .write_bytes( + .write( &balance_key, - Amount::from(ARBITRARY_OWNER_A_INITIAL_BALANCE) - .serialize_to_vec(), - WriteActions::All, + Amount::from(ARBITRARY_OWNER_A_INITIAL_BALANCE), ) .expect("Test failed"); diff --git a/wasm/wasm_source/src/tx_bridge_pool.rs b/wasm/wasm_source/src/tx_bridge_pool.rs index 3b5b36c2fa..7bfd461bb1 100644 --- a/wasm/wasm_source/src/tx_bridge_pool.rs +++ b/wasm/wasm_source/src/tx_bridge_pool.rs @@ -61,12 +61,8 @@ fn apply_tx(ctx: &mut Ctx, signed: Tx) -> TxResult { // add transfer into the pool let pending_key = bridge_pool::get_pending_key(&transfer); // TODO: what kind of write actions are desired here?? - ctx.write_bytes( - &pending_key, - transfer.serialize_to_vec(), - WriteActions::All, - ) - .wrap_err("Could not write transfer to bridge pool")?; + ctx.write(&pending_key, transfer) + .wrap_err("Could not write transfer to bridge pool")?; Ok(()) }