Skip to content
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

20.1.0 cleanup #1314

Merged
merged 12 commits into from
Jan 9, 2024
Merged

20.1.0 cleanup #1314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c792c33
20.1.0 cleanup
dmkozh Jan 5, 2024
fb2a943
Clippy updates
dmkozh Jan 5, 2024
342107f
More clippy fixes
dmkozh Jan 5, 2024
f2ffeb2
Fix unintentional observation diffs and update the intentional ones.
dmkozh Jan 5, 2024
75a838b
Test fix
dmkozh Jan 5, 2024
60aa558
Revert AsRef changes.
dmkozh Jan 8, 2024
31e1a2d
Build fix
dmkozh Jan 8, 2024
5c1fe52
Use `ScSymbol::try_from_bytes` in host obj conversion.
dmkozh Jan 8, 2024
2e2bc95
Merge branch 'main' into v20_1_0
dmkozh Jan 8, 2024
4d7a109
Add comment for SymbolObject
dmkozh Jan 8, 2024
2e7deeb
Merge branch 'v20_1_0' of https://github.com/dmkozh/rs-soroban-env in…
dmkozh Jan 8, 2024
b6c9adf
Add comment for linear memory tests.
dmkozh Jan 8, 2024
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 soroban-env-host/src/host/comparison.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ mod tests {
}),
ScVal::Bytes(xdr::ScBytes::try_from(vec![]).unwrap()),
ScVal::String(xdr::ScString::try_from(vec![]).unwrap()),
ScVal::Symbol(xdr::ScSymbol::try_from("big-symbol").unwrap()),
ScVal::Symbol(xdr::ScSymbol::try_from("very_big_symbol").unwrap()),
ScVal::Vec(Some(xdr::ScVec::try_from((0,)).unwrap())),
ScVal::Map(Some(xdr::ScMap::try_from(vec![]).unwrap())),
ScVal::Address(xdr::ScAddress::Contract(xdr::Hash([0; 32]))),
Expand Down Expand Up @@ -702,7 +702,7 @@ mod tests {
Tag::StringObject => Val::try_from_val(host, &"foo").unwrap(),
Tag::SymbolObject => Val::try_from_val(
host,
&ScVal::Symbol(xdr::ScSymbol::try_from("a-big-symbol").unwrap()),
&ScVal::Symbol(xdr::ScSymbol::try_from("a_very_big_symbol").unwrap()),
)
.unwrap(),
Tag::VecObject => {
Expand Down
9 changes: 8 additions & 1 deletion soroban-env-host/src/host/conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::rc::Rc;

use crate::host_object::MemHostObjectType;
use crate::{
budget::{AsBudget, DepthLimiter},
err,
Expand Down Expand Up @@ -500,7 +501,13 @@ impl Host {
}
ScVal::Bytes(b) => Ok(self.add_host_object(b.metered_clone(self)?)?.into()),
ScVal::String(s) => Ok(self.add_host_object(s.metered_clone(self)?)?.into()),
ScVal::Symbol(s) => Ok(self.add_host_object(s.metered_clone(self)?)?.into()),
graydon marked this conversation as resolved.
Show resolved Hide resolved
ScVal::Symbol(s) => Ok(self
.add_host_object(ScSymbol::try_from_bytes(
graydon marked this conversation as resolved.
Show resolved Hide resolved
self,
s.0.metered_clone(self.as_budget())?.into(),
)?)?
.into()),

ScVal::Address(addr) => Ok(self.add_host_object(addr.metered_clone(self)?)?.into()),

// None of the following cases should have made it into this function, they
Expand Down
Loading