Skip to content

fixed typo: split to -> split into #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aritkulova wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fixed typo: split to -> split into #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion simf/lib/u16/convert.simf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub fn u16_to_u256(a: u16) -> u256 {
/// Splitting uint conversions

/// Splits u16 into two u8
pub fn split_u16_to_u8(a: u16) -> (u8, u8) {
pub fn split_u16_into_u8(a: u16) -> (u8, u8) {
<u16>::into(a)
}

Expand Down
4 changes: 2 additions & 2 deletions simf/lib/u32/convert.simf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ pub fn u32_to_u256(a: u32) -> u256 {
/// Splitting uint conversions

/// Splits u32 into four u8
pub fn split_u32_to_u8(a: u32) -> (u8, u8, u8, u8) {
pub fn split_u32_into_u8(a: u32) -> (u8, u8, u8, u8) {
<u32>::into(a)
}

/// Splits u32 into two u16
pub fn split_u32_to_u16(a: u32) -> (u16, u16) {
pub fn split_u32_into_u16(a: u32) -> (u16, u16) {
<u32>::into(a)
}

Expand Down
2 changes: 1 addition & 1 deletion simf/lib/u8/convert.simf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn u8_to_u256(a: u8) -> u256 {
/// Splitting uint conversions

/// Splits u8 into eight u1
pub fn split_u8_to_u1(a: u8) -> (u1, u1, u1, u1, u1, u1, u1, u1) {
pub fn split_u8_into_u1(a: u8) -> (u1, u1, u1, u1, u1, u1, u1, u1) {
<u8>::into(a)
}

Expand Down
4 changes: 2 additions & 2 deletions simf/u16_convert_test.simf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::lib::u16::convert::{
u16_to_u64,
u16_to_u128,
u16_to_u256,
split_u16_to_u8,
split_u16_into_u8,
safe_u16_to_u1,
safe_u16_to_u8
};
Expand Down Expand Up @@ -55,7 +55,7 @@ fn main() {

match if_test_this_function(4, fn_idx) {
true => {
let (a1, a0): (u8, u8) = split_u16_to_u8(a);
let (a1, a0): (u8, u8) = split_u16_into_u8(a);

let (_, _, _, expected): (u64, u64, u64, u64) = <u256>::into(expected);
let expected: u16 = jet::rightmost_64_16(expected);
Expand Down
8 changes: 4 additions & 4 deletions simf/u32_convert_test.simf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use crate::lib::u32::convert::{
u32_to_u64,
u32_to_u128,
u32_to_u256,
split_u32_to_u8,
split_u32_to_u16,
split_u32_into_u8,
split_u32_into_u16,
safe_u32_to_u1,
safe_u32_to_u8,
safe_u32_to_u16
Expand Down Expand Up @@ -46,7 +46,7 @@ fn main() {

match if_test_this_function(3, fn_idx) {
true => {
let (a3, a2, a1, a0): (u8, u8, u8, u8) = split_u32_to_u8(a);
let (a3, a2, a1, a0): (u8, u8, u8, u8) = split_u32_into_u8(a);

let (_, _, _, expected): (u64, u64, u64, u64) = <u256>::into(expected);
let expected: u32 = jet::rightmost_64_32(expected);
Expand All @@ -67,7 +67,7 @@ fn main() {

match if_test_this_function(4, fn_idx) {
true => {
let (a1, a0): (u16, u16) = split_u32_to_u16(a);
let (a1, a0): (u16, u16) = split_u32_into_u16(a);

let (_, _, _, expected): (u64, u64, u64, u64) = <u256>::into(expected);
let expected: u32 = jet::rightmost_64_32(expected);
Expand Down
4 changes: 2 additions & 2 deletions simf/u8_convert_test.simf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::lib::u8::convert::{
u8_to_u64,
u8_to_u128,
u8_to_u256,
split_u8_to_u1,
split_u8_into_u1,
safe_u8_to_u1
};
// use crate::lib::u256::{split_256_into_64}; TODO: uncomment when u256 functions are merged
Expand Down Expand Up @@ -75,7 +75,7 @@ fn main() {
a2,
a1,
a0
): (u1, u1, u1, u1, u1, u1, u1, u1) = split_u8_to_u1(a);
): (u1, u1, u1, u1, u1, u1, u1, u1) = split_u8_into_u1(a);

let (_, _, _, expected): (u64, u64, u64, u64) = <u256>::into(expected);
let expected: u8 = jet::rightmost_64_8(expected);
Expand Down
6 changes: 3 additions & 3 deletions tests/u16_convert_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ enum FunctionToTest {
U16ToU64,
U16ToU128,
U16ToU256,
SplitU16ToU8,
SplitU16IntoU8,
SafeU16ToU1,
SafeU16ToU8,
}
Expand Down Expand Up @@ -105,14 +105,14 @@ mod u16_convert_test {
}

#[simplex::test]
fn u16_convert_test_split_u16_to_u8(context: simplex::TestContext) -> anyhow::Result<()> {
fn u16_convert_test_split_u16_into_u8(context: simplex::TestContext) -> anyhow::Result<()> {
let a = rand::thread_rng().gen_range(0..=u16::MAX);

run(
&context,
program(),
build_witness(
op(FunctionToTest::SplitU16ToU8),
op(FunctionToTest::SplitU16IntoU8),
a,
U256::from(a).to_big_endian(),
),
Expand Down
12 changes: 6 additions & 6 deletions tests/u32_convert_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ enum FunctionToTest {
U32ToU64,
U32ToU128,
U32ToU256,
SplitU32ToU8,
SplitU32ToU16,
SplitU32IntoU8,
SplitU32IntoU16,
SafeU32ToU1,
SafeU32ToU8,
SafeU32ToU16,
Expand Down Expand Up @@ -90,14 +90,14 @@ mod u32_convert_test {
}

#[simplex::test]
fn u32_convert_test_split_u32_to_u8(context: simplex::TestContext) -> anyhow::Result<()> {
fn u32_convert_test_split_u32_into_u8(context: simplex::TestContext) -> anyhow::Result<()> {
let a = rand::thread_rng().gen_range(0..=u32::MAX);

run(
&context,
program(),
build_witness(
op(FunctionToTest::SplitU32ToU8),
op(FunctionToTest::SplitU32IntoU8),
a,
U256::from(a).to_big_endian(),
),
Expand All @@ -106,14 +106,14 @@ mod u32_convert_test {
}

#[simplex::test]
fn u32_convert_test_split_u32_to_u16(context: simplex::TestContext) -> anyhow::Result<()> {
fn u32_convert_test_split_u32_into_u16(context: simplex::TestContext) -> anyhow::Result<()> {
let a = rand::thread_rng().gen_range(0..=u32::MAX);

run(
&context,
program(),
build_witness(
op(FunctionToTest::SplitU32ToU16),
op(FunctionToTest::SplitU32IntoU16),
a,
U256::from(a).to_big_endian(),
),
Expand Down
6 changes: 3 additions & 3 deletions tests/u8_convert_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum FunctionToTest {
U8ToU64,
U8ToU128,
U8ToU256,
SplitU8ToU1,
SplitU8IntoU1,
SafeU8ToU1,
}

Expand Down Expand Up @@ -121,14 +121,14 @@ mod u8_convert_test {
}

#[simplex::test]
fn u8_convert_test_split_u8_to_u1(context: simplex::TestContext) -> anyhow::Result<()> {
fn u8_convert_test_split_u8_into_u1(context: simplex::TestContext) -> anyhow::Result<()> {
let a = rand::thread_rng().gen_range(0..=u8::MAX);

run(
&context,
program(),
build_witness(
op(FunctionToTest::SplitU8ToU1),
op(FunctionToTest::SplitU8IntoU1),
a,
U256::from(a).to_big_endian(),
),
Expand Down