-
Notifications
You must be signed in to change notification settings - Fork 359
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for regression #1229 using new type ics02::TrustThreshold
- Loading branch information
Showing
15 changed files
with
183 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,4 @@ pub mod header; | |
| pub mod height; | ||
| pub mod misbehaviour; | ||
| pub mod msgs; | ||
| pub mod trust_threshold; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| //! IBC Domain type definition for [`TrustThreshold`] | ||
| //! represented as a fraction with valid values in the | ||
| //! range `[0, 1)`. | ||
| use std::{convert::TryFrom, fmt}; | ||
|
|
||
| use serde::{Deserialize, Serialize}; | ||
| use tendermint_proto::Protobuf; | ||
|
|
||
| use ibc_proto::ibc::lightclients::tendermint::v1::Fraction; | ||
| use tendermint::trust_threshold::TrustThresholdFraction; | ||
|
|
||
| use crate::ics02_client::error::Error; | ||
|
|
||
| /// [`TrustThreshold`] defines the level of trust that a client has | ||
| /// towards a set of validators of a chain. | ||
| /// | ||
| /// A trust threshold is represented as a fraction, i.e., a numerator and | ||
| /// and a denominator. | ||
| /// A typical trust threshold is 1/3 in practice. | ||
| /// This type accepts even a value of 0, (numerator = 0, denominator = 0), | ||
| /// which is used in the client state of an upgrading client. | ||
| #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] | ||
| pub struct TrustThreshold { | ||
| numerator: u64, | ||
| denominator: u64, | ||
| } | ||
|
|
||
| impl TrustThreshold { | ||
| /// Constant for a trust threshold of 1/3. | ||
| pub const ONE_THIRD: Self = Self { | ||
| numerator: 1, | ||
| denominator: 3, | ||
| }; | ||
|
|
||
| /// Constant for a trust threshold of 2/3. | ||
| pub const TWO_THIRDS: Self = Self { | ||
| numerator: 2, | ||
| denominator: 3, | ||
| }; | ||
|
|
||
| /// Constant for a trust threshold of 0/0. | ||
| pub const ZERO: Self = Self { | ||
| numerator: 0, | ||
| denominator: 0, | ||
| }; | ||
|
|
||
| /// Instantiate a TrustThreshold with the given denominator and | ||
| /// numerator. | ||
| /// | ||
| /// The constructor succeeds if long as the resulting fraction | ||
| /// is in the range`[0, 1)`. | ||
| pub fn new(numerator: u64, denominator: u64) -> Result<Self, Error> { | ||
| // The two parameters cannot yield a fraction that is bigger or equal to 1 | ||
| if (numerator > denominator) || (denominator == 0 && numerator != 0) || | ||
| (numerator == denominator && numerator != 0) { | ||
| return Err(Error::invalid_trust_threshold(numerator, denominator)); | ||
| } | ||
|
|
||
| Ok(Self { | ||
| numerator, | ||
| denominator, | ||
| }) | ||
| } | ||
|
|
||
| /// The numerator of the fraction underlying this trust threshold. | ||
| pub fn numerator(&self) -> u64 { | ||
| self.numerator | ||
| } | ||
|
|
||
| /// The denominator of the fraction underlying this trust threshold. | ||
| pub fn denominator(&self) -> u64 { | ||
| self.denominator | ||
| } | ||
| } | ||
|
|
||
| /// Conversion from Tendermint domain type into | ||
| /// IBC domain type. | ||
| impl From<TrustThresholdFraction> for TrustThreshold { | ||
| fn from(t: TrustThresholdFraction) -> Self { | ||
| Self { | ||
| numerator: t.numerator(), | ||
| denominator: t.denominator(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Conversion from IBC domain type into | ||
| /// Tendermint domain type. | ||
| impl TryFrom<TrustThreshold> for TrustThresholdFraction { | ||
| type Error = Error; | ||
|
|
||
| fn try_from(t: TrustThreshold) -> Result<TrustThresholdFraction, Error> { | ||
| Self::new(t.numerator, t.denominator) | ||
| .map_err(|e| Error::failed_trust_threshold_conversion(t.numerator, t.denominator, e)) | ||
| } | ||
| } | ||
|
|
||
| impl Protobuf<Fraction> for TrustThreshold {} | ||
|
|
||
| impl From<TrustThreshold> for Fraction { | ||
| fn from(t: TrustThreshold) -> Self { | ||
| Self { | ||
| numerator: t.numerator, | ||
| denominator: t.denominator, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<Fraction> for TrustThreshold { | ||
| type Error = Error; | ||
|
|
||
| fn try_from(value: Fraction) -> Result<Self, Self::Error> { | ||
| Self::new(value.numerator, value.denominator) | ||
| } | ||
| } | ||
|
|
||
| impl Default for TrustThreshold { | ||
| fn default() -> Self { | ||
| Self::ONE_THIRD | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Display for TrustThreshold { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| write!(f, "{}/{}", self.numerator, self.denominator) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.