Skip to content

Commit

Permalink
Other dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Rigidity committed Jul 11, 2024
1 parent 56594c3 commit ec1a930
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 104 deletions.
130 changes: 50 additions & 80 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ openssl = ["dep:openssl"]
lto = "thin"

[dependencies]
lazy_static = "1.4.0"
num-bigint = "0.4.4"
num-traits = "0.2.15"
lazy_static = "1.5.0"
num-bigint = "0.4.6"
num-traits = "0.2.19"
num-integer = "0.1.46"
chia-bls = "0.10.0"
sha2 = "0.10.8"
Expand All @@ -47,7 +47,7 @@ k256 = { version = "0.13.3", features = ["ecdsa"] }
p256 = { version = "0.13.2", features = ["ecdsa"] }

[dev-dependencies]
rstest = "0.17.0"
rstest = "0.21.0"
criterion = "0.5.1"
hex = "0.4.3"

Expand Down
10 changes: 5 additions & 5 deletions tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ readme = "README.md"
[dependencies]
hex-literal = "0.4.1"
hex = "0.4.3"
rand = "0.8.4"
rand = "0.8.5"
sha1 = "0.10.6"
linreg = "0.2.0"
clvmr = { path = ".." }
chia-bls = "0.10.0"
num-bigint = "0.4.4"
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96"
clap = { version = "4.4.18", features = ["derive"] }
num-bigint = "0.4.6"
serde = { version = "1.0.204", features = ["derive"] }
serde_json = "1.0.120"
clap = { version = "4.5.9", features = ["derive"] }

[[bin]]
name = "generate-fuzz-corpus"
Expand Down
8 changes: 4 additions & 4 deletions wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ path = "src/lib.rs"

[dependencies]
clvmr = { path = ".." }
wasm-bindgen = "0.2.87"
wasm-bindgen-test = "0.3.37"
js-sys = "0.3.61"
getrandom = { version = "0.2.9", features = ["js"] }
wasm-bindgen = "0.2.92"
wasm-bindgen-test = "0.3.42"
js-sys = "0.3.69"
getrandom = { version = "0.2.15", features = ["js"] }
2 changes: 1 addition & 1 deletion wheel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ path = "src/lib.rs"

[dependencies]
clvmr = { path = ".." }
pyo3 = { version = "0.21.2", features = ["abi3-py38", "extension-module"] }
pyo3 = { version = "0.22.1", features = ["abi3-py38", "extension-module"] }

[features]
openssl = ["clvmr/openssl"]
2 changes: 1 addition & 1 deletion wheel/src/adapt_response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub fn adapt_response(
Err(eval_err) => {
let sexp = LazyNode::new(Rc::new(allocator), eval_err.0).to_object(py);
let msg = eval_err.1.to_object(py);
let tuple = PyTuple::new(py, [msg, sexp]);
let tuple = PyTuple::new_bound(py, [msg, sexp]);
let value_error: PyErr = PyValueError::new_err(tuple.to_object(py));
Err(value_error)
}
Expand Down
12 changes: 8 additions & 4 deletions wheel/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ fn tuple_for_parsed_triple(py: Python<'_>, p: &ParsedTriple) -> PyObject {
start,
end,
atom_offset,
} => PyTuple::new(py, [*start, *end, *atom_offset as u64]),
} => PyTuple::new_bound(py, [*start, *end, *atom_offset as u64]),
ParsedTriple::Pair {
start,
end,
right_index,
} => PyTuple::new(py, [*start, *end, *right_index as u64]),
} => PyTuple::new_bound(py, [*start, *end, *right_index as u64]),
};
tuple.into_py(py)
}
Expand All @@ -67,12 +67,16 @@ fn deserialize_as_tree(
let mut cursor = io::Cursor::new(blob);
let (r, tree_hashes) = parse_triples(&mut cursor, calculate_tree_hashes)?;
let r = r.iter().map(|pt| tuple_for_parsed_triple(py, pt)).collect();
let s = tree_hashes.map(|ths| ths.iter().map(|b| PyBytes::new(py, b).into()).collect());
let s = tree_hashes.map(|ths| {
ths.iter()
.map(|b| PyBytes::new_bound(py, b).into())
.collect()
});
Ok((r, s))
}

#[pymodule]
fn clvm_rs(_py: Python, m: &PyModule) -> PyResult<()> {
fn clvm_rs(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_function(wrap_pyfunction!(run_serialized_chia_program, m)?)?;
m.add_function(wrap_pyfunction!(serialized_length, m)?)?;
m.add_function(wrap_pyfunction!(deserialize_as_tree, m)?)?;
Expand Down
Loading

0 comments on commit ec1a930

Please sign in to comment.