Skip to content

Commit

Permalink
fixup! Merge branch 'main' into main-TinyInt
Browse files Browse the repository at this point in the history
  • Loading branch information
JayWhite2357 committed Oct 5, 2024
1 parent 8c83e7a commit 1eb4752
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions crates/proof-of-sql/src/base/database/column_operation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2511,8 +2511,8 @@ mod test {
try_divide_decimal_columns(&lhs, &rhs, left_column_type, right_column_type).unwrap();
let expected_scalars = vec![
Curve25519Scalar::from(0_i64),
Curve25519Scalar::from(40000000_i64),
Curve25519Scalar::from(150000000_i64),
Curve25519Scalar::from(40_000_000_i64),
Curve25519Scalar::from(150_000_000_i64),
];
let expected = (Precision::new(11).unwrap(), 6, expected_scalars);
assert_eq!(expected, actual);
Expand Down Expand Up @@ -2545,9 +2545,9 @@ mod test {
let actual: (Precision, i8, Vec<Curve25519Scalar>) =
try_divide_decimal_columns(&lhs, &rhs, left_column_type, right_column_type).unwrap();
let expected_scalars = vec![
Curve25519Scalar::from(5633802),
Curve25519Scalar::from(-18292682),
Curve25519Scalar::from(-8695652),
Curve25519Scalar::from(5_633_802),
Curve25519Scalar::from(-18_292_682),
Curve25519Scalar::from(-8_695_652),
];
let expected = (Precision::new(18).unwrap(), 6, expected_scalars);
assert_eq!(expected, actual);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2258,7 +2258,7 @@ mod test {
let rhs =
OwnedColumn::<Curve25519Scalar>::Decimal75(Precision::new(3).unwrap(), 2, rhs_scalars);
let result = (lhs / rhs).unwrap();
let expected_scalars = [-400000000, 250000000, 100000000]
let expected_scalars = [-400_000_000, 250_000_000, 100_000_000]
.iter()
.map(Curve25519Scalar::from)
.collect();
Expand Down
4 changes: 2 additions & 2 deletions crates/proof-of-sql/src/base/database/owned_table_utility.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ pub fn owned_table<S: Scalar>(
OwnedTable::try_from_iter(iter).unwrap()
}

/// Creates a (Identifier, OwnedColumn) pair for a tinyint column.
/// This is primarily intended for use in conjunction with [owned_table].
/// Creates a (Identifier, `OwnedColumn`) pair for a tinyint column.
/// This is primarily intended for use in conjunction with [`owned_table`].
/// # Example
/// ```
/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar};
Expand Down

0 comments on commit 1eb4752

Please sign in to comment.