Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hylo-fix"
version = "0.2.0"
version = "0.3.0"
edition = "2021"
description = "Fixed-point number types with Solana Anchor support"
authors = ["0xPlish <plish@hylo.so>", "Curtis McEnroe <programble@gmail.com>"]
Expand All @@ -17,7 +17,7 @@ name = "fix"
idl-build = ["anchor-lang/idl-build"]

[dependencies]
anchor-lang = "0.30"
anchor-lang = "0.30.1"
anyhow = "1.0.82"
muldiv = "1.0.1"
num-traits = "0.2.17"
Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
openssl
pkg-config
rust-bin.stable.latest.complete
rust-analyzer
];
};
};
Expand Down
24 changes: 19 additions & 5 deletions src/fix_value.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use crate::typenum::{Integer, U10};
use crate::Fix;
use anchor_lang::prelude::{borsh, AnchorDeserialize, AnchorSerialize, InitSpace};

use anchor_lang::error::ErrorCode::InvalidNumericConversion;
use anchor_lang::prelude::{borsh, AnchorDeserialize, AnchorSerialize, InitSpace, Result};
use paste::paste;

macro_rules! impl_fix_value {
Expand Down Expand Up @@ -33,13 +35,18 @@ macro_rules! impl_fix_value {
}
}

impl<Bits, Exp> From<[<$sign FixValue $bits>]> for Fix<Bits, U10, Exp>
impl<Bits, Exp> TryFrom<[<$sign FixValue $bits>]> for Fix<Bits, U10, Exp>
where
Bits: From<[<$sign:lower $bits>]>,
Exp: Integer,
{
fn from(value: [<$sign FixValue $bits>]) -> Fix<Bits, U10, Exp> {
Fix::new(value.bits.into())
type Error = anchor_lang::error::Error;
fn try_from(value: [<$sign FixValue $bits>]) -> Result<Fix<Bits, U10, Exp>> {
if value.exp == Exp::to_i8() {
Ok(Fix::new(value.bits.into()))
} else {
Err(InvalidNumericConversion.into())
}
}
}
}
Expand Down Expand Up @@ -71,7 +78,7 @@ mod tests {
fn [<roundtrip_into_ $sign:lower $bits>]() -> Result<()> {
let start = Kilo::new([<69 $sign:lower $bits>]);
let there: [<$sign FixValue $bits>] = start.into();
let back: Kilo<[<$sign:lower $bits>]> = there.into();
let back: Kilo<[<$sign:lower $bits>]> = there.try_into()?;
assert_eq!(there, [<$sign FixValue $bits>]::new(69, 3));
Ok(assert_eq!(start, back))
}
Expand All @@ -83,6 +90,13 @@ mod tests {
let back = AnchorDeserialize::deserialize(&mut bytes.as_slice())?;
Ok(assert_eq!(start, back))
}

#[test]
fn [<wrong_exp_should_fail_ $sign:lower $bits>]() -> Result<()> {
let pow11 = [<$sign FixValue $bits>]::new(42, -11);
let wrong = TryInto::<Kilo<[<$sign:lower $bits>]>>::try_into(pow11);
Ok(assert_eq!(Err(InvalidNumericConversion.into()), wrong))
}
}
};
}
Expand Down