gov: env agnostic VP

anoma · Sep 12, 2024 · 95c58a6 · 95c58a6
1 parent 15ffacc
commit 95c58a6
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 229 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/benches/native_vps.rs b/crates/benches/native_vps.rs
@@ -220,7 +220,7 @@ fn governance(c: &mut Criterion) {
         let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
             &TxGasMeter::new(u64::MAX),
         ));
-        let governance = GovernanceVp::new(Ctx::new(
+        let ctx = Ctx::new(
             &Address::Internal(InternalAddress::Governance),
             &shell.state,
             &signed_tx.tx,
@@ -230,18 +230,18 @@ fn governance(c: &mut Criterion) {
             &keys_changed,
             &verifiers,
             shell.vp_wasm_cache.clone(),
-        ));
+        );
 
         group.bench_function(bench_name, |b| {
             b.iter(|| {
                 assert!(
-                    governance
-                        .validate_tx(
-                            &signed_tx.to_ref(),
-                            governance.ctx.keys_changed,
-                            governance.ctx.verifiers,
-                        )
-                        .is_ok()
+                    GovernanceVp::validate_tx(
+                        &ctx,
+                        &signed_tx.to_ref(),
+                        ctx.keys_changed,
+                        ctx.verifiers,
+                    )
+                    .is_ok()
                 )
             })
         });

diff --git a/crates/governance/Cargo.toml b/crates/governance/Cargo.toml
@@ -30,6 +30,7 @@ namada_state = { path = "../state" }
 namada_systems = { path = "../systems" }
 namada_tx = { path = "../tx" }
 namada_vp = { path = "../vp" }
+namada_vp_env = { path = "../vp_env" }
 
 arbitrary = { workspace = true, optional = true }
 borsh.workspace = true