Skip to content

Commit

Permalink
Merge branch 'bat/feat/new-genesis-CI' of github.com:anoma/namada int…
Browse files Browse the repository at this point in the history
…o bat/feat/new-genesis-CI

* 'bat/feat/new-genesis-CI' of github.com:anoma/namada:
  fix fmt
  fix `make check-crates`
  More fixes
  [fix]: Fixed unit tests
  [fix]: Compiling now. Tests need fixing
  fixup! [feat] Re-implementing new genesis flow in v0.24
  [feat] Re-implementing new genesis flow in v0.24
  Namada 0.24.1
  test: remove dead multitoken_tests
  remove vp/tx cache at startup
  [ci skip] specifiy aws region
  improve sdk
  added changelog
  wasm server download via env
  changelog: add #2047
  apps: turn off rocksdb jemalloc on windows
  • Loading branch information
batconjurer committed Nov 2, 2023
2 parents 46841a2 + 0e04a92 commit 8f6cc6f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion tests/src/integration/masp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ use namada_sdk::masp::fs::FsShieldedUtils;
use test_log::test;

use super::setup;
use crate::e2e::setup::constants::{AA_PAYMENT_ADDRESS, AA_VIEWING_KEY, AB_PAYMENT_ADDRESS, AB_VIEWING_KEY, AC_PAYMENT_ADDRESS, AC_VIEWING_KEY, ALBERT, A_SPENDING_KEY, BB_PAYMENT_ADDRESS, BERTHA, BTC, B_SPENDING_KEY, CHRISTEL, ETH, MASP, NAM, BERTHA_KEY, ALBERT_KEY, CHRISTEL_KEY};
use crate::e2e::setup::constants::{
AA_PAYMENT_ADDRESS, AA_VIEWING_KEY, AB_PAYMENT_ADDRESS, AB_VIEWING_KEY,
AC_PAYMENT_ADDRESS, AC_VIEWING_KEY, ALBERT, ALBERT_KEY, A_SPENDING_KEY,
BB_PAYMENT_ADDRESS, BERTHA, BERTHA_KEY, BTC, B_SPENDING_KEY, CHRISTEL,
CHRISTEL_KEY, ETH, MASP, NAM,
};

/// In this test we verify that users of the MASP receive the correct rewards
/// for leaving their assets in the pool for varying periods of time.
Expand Down

0 comments on commit 8f6cc6f

Please sign in to comment.