remove unnecessary trait bounds

crates/ethereum_bridge/src/vp/bridge_pool_vp.rs

@@ -67,7 +67,6 @@ impl AmountDelta {
 pub struct BridgePool<'ctx, S, CA, EVAL, TokenKeys>
 where
     S: 'static + StateRead,
-    EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/ethereum_bridge/src/vp/eth_bridge_vp.rs

@@ -24,7 +24,6 @@ pub struct Error(#[from] native_vp::Error);
 pub struct EthBridge<'ctx, S, CA, EVAL, TokenKeys>
 where
     S: 'static + StateRead,
-    EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/ethereum_bridge/src/vp/nut_vp.rs

@@ -24,7 +24,6 @@ pub struct Error(#[from] native_vp::Error);
 pub struct NonUsableTokens<'ctx, S, CA, EVAL, TokenKeys>
 where
     S: 'static + StateRead,
-    EVAL: 'static + VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/governance/src/vp/mod.rs

@@ -52,7 +52,6 @@ pub enum Error {
 pub struct GovernanceVp<'ctx, S, CA, EVAL, PoS, TokenKeys>
 where
     S: StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/governance/src/vp/pgf.rs

@@ -35,7 +35,6 @@ pub enum Error {
 pub struct PgfVp<'ctx, S, CA, EVAL>
 where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/ibc/src/vp/context.rs

@@ -27,7 +27,6 @@ use crate::{IbcCommonContext, IbcStorageContext};
 pub struct PseudoExecutionContext<'view, 'a, S, CA, EVAL, Token>
 where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'a, S, CA, EVAL>,
 {
     /// Execution context and storage
     pub storage: PseudoExecutionStorage<'view, 'a, S, CA, EVAL>,
@@ -40,7 +39,6 @@ where
 pub struct PseudoExecutionStorage<'view, 'a, S, CA, EVAL>
 where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'a, S, CA, EVAL>,
 {
     /// Temporary store for pseudo execution
     store: HashMap<Key, StorageModification>,

crates/ibc/src/vp/mod.rs

@@ -82,7 +82,6 @@ pub struct Ibc<
     Transfer,
 > where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/parameters/src/vp.rs

@@ -30,7 +30,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub struct ParametersVp<'ctx, S, CA, EVAL, Gov>
 where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/proof_of_stake/src/vp.rs

@@ -40,7 +40,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub struct PosVp<'ctx, S, CA, EVAL, Gov>
 where
     S: StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/shielded_token/src/vp.rs

@@ -53,7 +53,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub struct MaspVp<'ctx, S, CA, EVAL, Params, Gov, Ibc, TransToken, Transfer>
 where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/trans_token/src/vp.rs

@@ -49,7 +49,6 @@ pub type Result<T> = std::result::Result<T, Error>;
 pub struct MultitokenVp<'ctx, S, CA, EVAL, Params, Gov>
 where
     S: 'static + StateRead,
-    EVAL: VpEvaluator<'ctx, S, CA, EVAL>,
 {
     /// Context to interact with the host structures.
     pub ctx: Ctx<'ctx, S, CA, EVAL>,

crates/vm/src/host_env.rs

@@ -90,7 +90,6 @@ pub struct TxVmEnv<MEM, D, H, CA>
 where
     D: DB + for<'iter> DBIter<'iter>,
     H: StorageHasher,
-    CA: WasmCacheAccess,
 {
     /// The VM memory for bi-directional data passing
     pub memory: MEM,
@@ -104,7 +103,6 @@ pub struct TxCtx<D, H, CA>
 where
     D: DB + for<'iter> DBIter<'iter>,
     H: StorageHasher,
-    CA: WasmCacheAccess,
 {
     /// Mutable access to write log.
     pub write_log: HostRef<RwAccess, WriteLog>,
@@ -302,8 +300,6 @@ pub struct VpVmEnv<MEM, D, H, EVAL, CA>
 where
     D: DB + for<'iter> DBIter<'iter>,
     H: StorageHasher,
-    EVAL: VpEvaluator,
-    CA: WasmCacheAccess,
 {
     /// The VM memory for bi-directional data passing
     pub memory: MEM,
@@ -316,8 +312,6 @@ pub struct VpCtx<D, H, EVAL, CA>
 where
     D: DB + for<'iter> DBIter<'iter>,
     H: StorageHasher,
-    EVAL: VpEvaluator,
-    CA: WasmCacheAccess,
 {
     /// The address of the account that owns the VP
     pub address: HostRef<RoAccess, Address>,

crates/vm/src/wasm/compilation_cache/common.rs

@@ -25,7 +25,7 @@ use crate::{WasmCacheAccess, WasmCacheRoAccess};
 
 /// Cache handle. Thread-safe.
 #[derive(Debug, Clone)]
-pub struct Cache<N: CacheName, A: WasmCacheAccess> {
+pub struct Cache<N, A> {
     /// Cached files directory
     dir: PathBuf,
     /// Compilation progress

crates/vp/src/native_vp.rs

@@ -54,7 +54,6 @@ pub trait NativeVp<'a> {
 pub struct Ctx<'a, S, CA, EVAL>
 where
     S: StateRead,
-    EVAL: VpEvaluator<'a, S, CA, EVAL>,
 {
     /// The address of the account that owns the VP
     pub address: &'a Address,
@@ -86,7 +85,6 @@ where
 pub trait VpEvaluator<'a, S, CA, EVAL>
 where
     S: 'a + StateRead,
-    EVAL: VpEvaluator<'a, S, CA, EVAL>,
 {
     /// Evaluate a given validity predicate code with the given input data.
     /// Currently, we can only evaluate VPs using WASM runner with WASM memory.
@@ -106,7 +104,6 @@ where
 pub struct CtxPreStorageRead<'view, 'a, S, CA, EVAL>
 where
     S: StateRead,
-    EVAL: VpEvaluator<'a, S, CA, EVAL>,
 {
     /// The inner context
     pub ctx: &'view Ctx<'a, S, CA, EVAL>,
@@ -118,7 +115,6 @@ where
 pub struct CtxPostStorageRead<'view, 'a, S, CA, EVAL>
 where
     S: StateRead,
-    EVAL: VpEvaluator<'a, S, CA, EVAL>,
 {
     /// The inner context
     pub ctx: &'view Ctx<'a, S, CA, EVAL>,