Skip to content
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

Removes redundant WasmPayload enum #1874

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Removes redundant WasmPayload enum #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bb7808
Removes redundant `WasmPayload` enum
grarco Sep 7, 2023
651d30f
changelog: add #1874
grarco Sep 7, 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
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/1874-remove-redundant-struct.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Removed redundant `WasmPayload` enum in favor of `Commitment`.
([\#1874](https://github.com/anoma/namada/pull/1874))
8 changes: 4 additions & 4 deletions benches/vps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ fn vp_user(c: &mut Criterion) {
b.iter(|| {
assert!(
run::vp(
&vp_code_hash,
vp_code_hash,
signed_tx,
&TxIndex(0),
&defaults::albert_address(),
Expand Down Expand Up @@ -296,7 +296,7 @@ fn vp_implicit(c: &mut Criterion) {
b.iter(|| {
assert!(
run::vp(
&vp_code_hash,
vp_code_hash,
tx,
&TxIndex(0),
&Address::from(&implicit_account.to_public()),
Expand Down Expand Up @@ -447,7 +447,7 @@ fn vp_validator(c: &mut Criterion) {
b.iter(|| {
assert!(
run::vp(
&vp_code_hash,
vp_code_hash,
signed_tx,
&TxIndex(0),
&defaults::validator_address(),
Expand Down Expand Up @@ -538,7 +538,7 @@ fn vp_masp(c: &mut Criterion) {
b.iter(|| {
assert!(
run::vp(
&vp_code_hash,
vp_code_hash,
&signed_tx,
&TxIndex(0),
&defaults::validator_address(),
Expand Down
2 changes: 1 addition & 1 deletion shared/src/ledger/protocol/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ where
// the first signature verification (if any) is accounted
// twice
wasm::run::vp(
&vp_code_hash,
vp_code_hash,
tx,
tx_index,
addr,
Expand Down
46 changes: 16 additions & 30 deletions shared/src/vm/wasm/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ pub enum Error {
/// Result for functions that may fail
pub type Result<T> = std::result::Result<T, Error>;

enum WasmPayload<'fetch> {
Hash(&'fetch Hash),
Code(&'fetch [u8]),
}

/// Execute a transaction code. Returns the set verifiers addresses requested by
/// the transaction.
#[allow(clippy::too_many_arguments)]
Expand All @@ -112,19 +107,10 @@ where
.get_section(tx.code_sechash())
.and_then(|x| Section::code_sec(x.as_ref()))
.ok_or(Error::MissingCode)?;
let (tx_hash, code) = match tx_code.code {
Commitment::Hash(code_hash) => (code_hash, None),
Commitment::Id(tx_code) => (Hash::sha256(&tx_code), Some(tx_code)),
};

let code_or_hash = match code {
Some(ref code) => WasmPayload::Code(code),
None => WasmPayload::Hash(&tx_hash),
};

let (module, store) = fetch_or_compile(
tx_wasm_cache,
code_or_hash,
&tx_code.code,
write_log,
storage,
gas_meter,
Expand Down Expand Up @@ -195,7 +181,7 @@ where
/// that triggered the execution.
#[allow(clippy::too_many_arguments)]
pub fn vp<DB, H, CA>(
vp_code_hash: &Hash,
vp_code_hash: Hash,
tx: &Tx,
tx_index: &TxIndex,
address: &Address,
Expand All @@ -215,7 +201,7 @@ where
// Compile the wasm module
let (module, store) = fetch_or_compile(
&mut vp_wasm_cache,
WasmPayload::Hash(vp_code_hash),
&Commitment::Hash(vp_code_hash),
write_log,
storage,
gas_meter,
Expand Down Expand Up @@ -254,7 +240,7 @@ where
run_vp(
module,
imports,
vp_code_hash,
&vp_code_hash,
tx,
address,
keys_changed,
Expand Down Expand Up @@ -399,7 +385,7 @@ where
// Compile the wasm module
let (module, store) = fetch_or_compile(
vp_wasm_cache,
WasmPayload::Hash(&vp_code_hash),
&Commitment::Hash(vp_code_hash),
write_log,
storage,
gas_meter,
Expand Down Expand Up @@ -455,7 +441,7 @@ pub fn prepare_wasm_code<T: AsRef<[u8]>>(code: T) -> Result<Vec<u8>> {
// loading and code compilation gas costs.
fn fetch_or_compile<DB, H, CN, CA>(
wasm_cache: &mut Cache<CN, CA>,
code_or_hash: WasmPayload,
code_or_hash: &Commitment,
write_log: &WriteLog,
storage: &Storage<DB, H>,
gas_meter: &mut dyn GasMetering,
Expand All @@ -467,7 +453,7 @@ where
CA: 'static + WasmCacheAccess,
{
match code_or_hash {
WasmPayload::Hash(code_hash) => {
Commitment::Hash(code_hash) => {
let (module, store, tx_len) = match wasm_cache.fetch(code_hash)? {
Some((module, store)) => {
// Gas accounting even if the compiled module is in cache
Expand Down Expand Up @@ -541,7 +527,7 @@ where
gas_meter.add_compiling_gas(tx_len)?;
Ok((module, store))
}
WasmPayload::Code(code) => {
Commitment::Id(code) => {
gas_meter.add_compiling_gas(
u64::try_from(code.len())
.map_err(|e| Error::ConversionError(e.to_string()))?,
Expand Down Expand Up @@ -752,7 +738,7 @@ mod tests {
// When the `eval`ed VP doesn't run out of memory, it should return
// `true`
let passed = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down Expand Up @@ -786,7 +772,7 @@ mod tests {
// `false`, hence we should also get back `false` from the VP that
// called `eval`.
let passed = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down Expand Up @@ -840,7 +826,7 @@ mod tests {
outer_tx.set_code(Code::new(vec![]));
let (vp_cache, _) = wasm::compilation_cache::common::testing::cache();
let result = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand All @@ -862,7 +848,7 @@ mod tests {
outer_tx.header.chain_id = storage.chain_id.clone();
outer_tx.set_data(Data::new(tx_data));
let error = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down Expand Up @@ -976,7 +962,7 @@ mod tests {
outer_tx.set_code(Code::new(vec![]));
let (vp_cache, _) = wasm::compilation_cache::common::testing::cache();
let result = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down Expand Up @@ -1104,7 +1090,7 @@ mod tests {
outer_tx.set_code(Code::new(vec![]));
let (vp_cache, _) = wasm::compilation_cache::common::testing::cache();
let error = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down Expand Up @@ -1183,7 +1169,7 @@ mod tests {

let (vp_cache, _) = wasm::compilation_cache::common::testing::cache();
let passed = vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down Expand Up @@ -1317,7 +1303,7 @@ mod tests {
storage.write(&len_key, code_len).unwrap();

vp(
&code_hash,
code_hash,
&outer_tx,
&tx_index,
&addr,
Expand Down