Skip to content

Commit

Permalink
fix vm-runtime-types (#4205)
Browse files Browse the repository at this point in the history
* fix lifetime error in vm/framework/src/natives/cryptography/bulletproofs.rs
  • Loading branch information
simonjiao committed Sep 23, 2024
1 parent fdae842 commit ec2bf44
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -627,4 +627,5 @@ debug = false
#opt-level = 2

[patch.crates-io]
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
merlin = { git = "https://github.com/aptos-labs/merlin" }
6 changes: 3 additions & 3 deletions vm/vm-runtime-types/src/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use starcoin_vm_types::{
state_key::StateKey,
state_storage_usage::StateStorageUsage,
state_value::{StateValue, StateValueMetadata},
StateView, StateViewId,
},
state_view::{StateView, StateViewId},
};
use std::collections::{BTreeMap, HashMap};

Expand Down Expand Up @@ -235,7 +235,7 @@ where
state_key: &Self::Key,
_maybe_layout: Option<&Self::Layout>,
) -> anyhow::Result<Option<StateValue>> {
self.get_state_value(state_key)
self.get_state_value(state_key).map_err(Into::into)
}
}

Expand All @@ -246,7 +246,7 @@ where
type Key = StateKey;

fn get_module_state_value(&self, state_key: &Self::Key) -> anyhow::Result<Option<StateValue>> {
self.get_state_value(state_key)
self.get_state_value(state_key).map_err(Into::into)
}
}

Expand Down
2 changes: 1 addition & 1 deletion vm/vm-runtime-types/src/storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl StorageGasParameters {
pub fn new(
feature_version: u64,
gas_params: &StarcoinGasParameters,
config_storage: &impl ConfigStorage,
_config_storage: &impl ConfigStorage,
) -> Self {
let change_set_configs = ChangeSetConfigs::new(feature_version, gas_params);

Expand Down

0 comments on commit ec2bf44

Please sign in to comment.