Skip to content

Commit

Permalink
Merge branch 'grarco/ferveo-cleanup' (#3241)
Browse files Browse the repository at this point in the history
* grarco/ferveo-cleanup:
  Updates wrapper tx constructor documentation
  Changelog #3241
  Cleans up ferveo-related things
  • Loading branch information
brentstone committed May 16, 2024
2 parents 00008b7 + 8c0b9e4 commit 112db3b
Show file tree
Hide file tree
Showing 6 changed files with 229 additions and 296 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/3241-ferveo-cleanup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Removed the remaining references to ferveo.
([\#3241](https://github.com/anoma/namada/pull/3241))
12 changes: 1 addition & 11 deletions crates/sdk/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ pub mod testing {
BecomeValidator, Bond, CommissionChange, ConsensusKeyChange,
MetaDataChange, Redelegation, Unbond, Withdraw,
};
use namada_tx::data::{DecryptedTx, Fee, TxType, WrapperTx};
use namada_tx::data::{Fee, TxType, WrapperTx};
use proptest::prelude::{Just, Strategy};
use proptest::{arbitrary, collection, option, prop_compose, prop_oneof};
use prost::Message;
Expand Down Expand Up @@ -966,16 +966,6 @@ pub mod testing {
}
}

prop_compose! {
// Generate an arbitrary decrypted transaction
pub fn arb_decrypted_tx()(decrypted_tx in prop_oneof![
Just(DecryptedTx::Decrypted),
Just(DecryptedTx::Undecryptable),
]) -> DecryptedTx {
decrypted_tx
}
}

prop_compose! {
// Generate an arbitrary transaction type
pub fn arb_tx_type()(tx_type in prop_oneof![
Expand Down
2 changes: 1 addition & 1 deletion crates/tests/src/integration/masp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@ fn multiple_unfetched_txs_same_block() -> Result<()> {
for bytes in txs_bytes {
let mut tx = namada::tx::Tx::deserialize(&bytes).unwrap();
tx.add_wrapper(
namada::tx::data::wrapper_tx::Fee {
namada::tx::data::wrapper::Fee {
amount_per_gas_unit: DenominatedAmount::native(1.into()),
token: native_token.clone(),
},
Expand Down
43 changes: 0 additions & 43 deletions crates/tx/src/data/decrypted.rs

This file was deleted.

4 changes: 0 additions & 4 deletions crates/tx/src/data/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
//! Data-Types that are used in transactions.
/// txs that contain decrypted payloads or assertions of
/// non-decryptability
pub mod decrypted;
pub mod eval_vp;
/// txs to manage pgf
pub mod pgf;
Expand All @@ -18,7 +15,6 @@ use std::fmt::{self, Display};
use std::str::FromStr;

use bitflags::bitflags;
pub use decrypted::*;
use namada_core::address::Address;
use namada_core::borsh::{
BorshDeserialize, BorshSchema, BorshSerialize, BorshSerializeExt,
Expand Down
Loading

0 comments on commit 112db3b

Please sign in to comment.