Skip to content

Commit

Permalink
Expose Burn, NoBurn, and IssueData from orchard_zsa module directly
Browse files Browse the repository at this point in the history
  • Loading branch information
dmidem committed Nov 3, 2024
1 parent 2587b04 commit 7447d45
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
3 changes: 0 additions & 3 deletions zebra-chain/src/orchard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,3 @@ pub(crate) use shielded_data::ActionCommon;

#[cfg(feature = "tx-v6")]
pub use orchard_flavor_ext::OrchardZSA;

#[cfg(feature = "tx-v6")]
pub(crate) use crate::orchard_zsa::issuance::IssueData;
2 changes: 1 addition & 1 deletion zebra-chain/src/orchard/orchard_flavor_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use orchard::{note_encryption::OrchardDomainCommon, orchard_flavor};
use crate::serialization::{ZcashDeserialize, ZcashSerialize};

#[cfg(feature = "tx-v6")]
use crate::orchard_zsa::burn::{Burn, NoBurn};
use crate::orchard_zsa::{Burn, NoBurn};

use super::note;

Expand Down
7 changes: 4 additions & 3 deletions zebra-chain/src/orchard_zsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ pub(crate) mod arbitrary;

mod common;

pub mod burn;
pub mod issuance;
mod burn;
mod issuance;

pub use burn::BurnItem;
pub(crate) use burn::{Burn, NoBurn};
pub(crate) use issuance::IssueData;
4 changes: 2 additions & 2 deletions zebra-chain/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub use unmined::{

use crate::{
amount::{Amount, Error as AmountError, NegativeAllowed, NonNegative},
block, orchard,
block, orchard, orchard_zsa,
parameters::{ConsensusBranchId, NetworkUpgrade},
primitives::{ed25519, Bctv14Proof, Groth16Proof},
sapling,
Expand Down Expand Up @@ -245,7 +245,7 @@ pub enum Transaction {
orchard_shielded_data: Option<orchard::ShieldedData<orchard::OrchardZSA>>,
/// The ZSA issuance data for this transaction, if any.
#[cfg(feature = "tx-v6")]
orchard_zsa_issue_data: Option<orchard::IssueData>,
orchard_zsa_issue_data: Option<orchard_zsa::IssueData>,
},
}

Expand Down
2 changes: 1 addition & 1 deletion zebra-chain/src/transaction/arbitrary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::{
};

#[cfg(feature = "tx-v6")]
use crate::orchard_zsa::issuance::IssueData;
use crate::orchard_zsa::IssueData;

use itertools::Itertools;

Expand Down

0 comments on commit 7447d45

Please sign in to comment.