Skip to content

Commit

Permalink
Merge branch '2.0' into wallet-transaction-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Thoralf-M committed Mar 19, 2024
2 parents 784c841 + 7e2b354 commit 0f9b262
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions sdk/src/types/block/output/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub mod unlock_condition;
use core::ops::RangeInclusive;

use derive_more::From;
use getset::Getters;
use getset::CopyGetters;
use packable::Packable;

pub(crate) use self::unlock_condition::AddressUnlockCondition;
Expand Down Expand Up @@ -406,8 +406,9 @@ pub trait MinimumOutputAmount: StorageScore {
}

/// Decayed stored and potential Mana of an output.
#[derive(Debug, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Getters, derive_more::AddAssign)]
#[derive(Debug, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, CopyGetters, derive_more::AddAssign)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
#[getset(get = "pub")]
pub struct DecayedMana {
/// Decayed stored mana.
#[cfg_attr(feature = "serde", serde(with = "string"))]
Expand Down

0 comments on commit 0f9b262

Please sign in to comment.