Adapt SDK to changes to {Try,}{From,Into}Val in env crates. (#824)

Adapts the SDK to changes in stellar/rs-soroban-env#628 -- this variant finally worked ok. Very minor warts, lots of code removal.
stellar · Jan 17, 2023 · e1c3de3 · e1c3de3
1 parent a7cf3f0
commit e1c3de3
Show file tree

Hide file tree

Showing 32 changed files with 335 additions and 711 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,17 +37,17 @@ soroban-token-spec = { version = "0.4.3", path = "soroban-token-spec" }
 [workspace.dependencies.soroban-env-common]
 version = "0.0.12"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "65498c8"
+rev = "993c527abce72748405d71467498bffd63e061c1"
 
 [workspace.dependencies.soroban-env-guest]
 version = "0.0.12"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "65498c8"
+rev = "993c527abce72748405d71467498bffd63e061c1"
 
 [workspace.dependencies.soroban-env-host]
 version = "0.0.12"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "65498c8"
+rev = "993c527abce72748405d71467498bffd63e061c1"
 
 [workspace.dependencies.stellar-strkey]
 version = "0.0.6"

diff --git a/soroban-auth/src/tests/test_ed25519.rs b/soroban-auth/src/tests/test_ed25519.rs
@@ -22,7 +22,7 @@ impl ExampleContract {
             &env,
             &sig,
             symbol!("examplefn"),
-            (&sig.identifier(&env), arg1, arg2),
+            (sig.identifier(&env), arg1, arg2),
         );
     }
 }
@@ -54,7 +54,7 @@ fn test() {
         &signer,
         &contract_id,
         symbol!("examplefn"),
-        (&id, &1, &2),
+        (id, 1, 2),
     );
     std::println!("signature: {:?}", sig);
 
@@ -92,7 +92,7 @@ fn test_build_keypair() {
         &signer,
         &contract_id,
         symbol!("examplefn"),
-        (&id, &1, &2),
+        (id, 1, 2),
     );
     std::println!("signature: {:?}", sig);
 

diff --git a/soroban-auth/src/tests/test_ed25519_with_nonce.rs b/soroban-auth/src/tests/test_ed25519_with_nonce.rs
@@ -9,7 +9,7 @@ pub enum DataKey {
 
 fn read_nonce(e: &Env, id: &Identifier) -> i128 {
     let key = DataKey::Nonce(id.clone());
-    e.storage().get(key).unwrap_or(Ok(0)).unwrap()
+    e.storage().get(&key).unwrap_or(Ok(0)).unwrap()
 }
 
 fn verify_and_consume_nonce(e: &Env, id: &Identifier, expected_nonce: i128) {
@@ -29,7 +29,7 @@ fn verify_and_consume_nonce(e: &Env, id: &Identifier, expected_nonce: i128) {
     if nonce != expected_nonce {
         panic!("incorrect nonce")
     }
-    e.storage().set(key, &nonce + 1);
+    e.storage().set(&key, &(nonce + 1));
 }
 
 pub struct TestContract;
@@ -41,7 +41,7 @@ impl TestContract {
 
         verify_and_consume_nonce(&e, &auth_id, nonce);
 
-        verify(&e, &sig, symbol!("verify_sig"), (&auth_id, nonce));
+        verify(&e, &sig, symbol!("verify_sig"), (auth_id, nonce));
     }
 
     pub fn nonce(e: Env, id: Identifier) -> i128 {
@@ -54,7 +54,7 @@ pub struct OuterTestContract;
 #[contractimpl]
 impl OuterTestContract {
     pub fn authorize(e: Env, contract_id: BytesN<32>) {
-        let client = TestContractClient::new(&e, contract_id);
+        let client = TestContractClient::new(&e, &contract_id);
         client.verify_sig(&Signature::Invoker, &0);
     }
 }
@@ -74,7 +74,7 @@ fn test() {
         &signer,
         &contract_id,
         symbol!("verify_sig"),
-        (&id, &nonce),
+        (id, nonce),
     );
 
     client.verify_sig(&sig, &nonce);

diff --git a/soroban-sdk-macros/src/derive_client.rs b/soroban-sdk-macros/src/derive_client.rs
@@ -193,7 +193,7 @@ pub fn derive_client(name: &str, fns: &[ClientFn]) -> TokenStream {
         }
 
         impl #client_ident {
-            pub fn new(env: &soroban_sdk::Env, contract_id: impl soroban_sdk::IntoVal<soroban_sdk::Env, soroban_sdk::BytesN<32>>) -> Self {
+            pub fn new(env: &soroban_sdk::Env, contract_id: &impl soroban_sdk::IntoVal<soroban_sdk::Env, soroban_sdk::BytesN<32>>) -> Self {
                 Self {
                     env: env.clone(),
                     contract_id: contract_id.into_val(env),

diff --git a/soroban-sdk-macros/src/derive_enum.rs b/soroban-sdk-macros/src/derive_enum.rs
@@ -21,7 +21,7 @@ pub fn derive_type_enum(
     let mut errors = Vec::<Error>::new();
 
     let variants = &data.variants;
-    let (spec_cases, discriminant_consts, try_froms, intos, try_from_xdrs, into_xdrs): (Vec<_>, Vec<_>, Vec<_>, Vec<_>, Vec<_>, Vec<_>) = variants
+    let (spec_cases, discriminant_consts, try_froms, try_intos, try_from_xdrs, into_xdrs): (Vec<_>, Vec<_>, Vec<_>, Vec<_>, Vec<_>, Vec<_>) = variants
         .iter()
         .map(|v| {
             // TODO: Choose discriminant type based on repr type of enum.
@@ -72,7 +72,12 @@ pub fn derive_type_enum(
                         Self::#ident(iter.next().ok_or(#path::ConversionError)??.try_into_val(env)?)
                     }
                 };
-                let into = quote! { #enum_ident::#ident(ref value) => (#discriminant_const_sym_ident, value).into_val(env) };
+                let try_into = quote! {
+                    #enum_ident::#ident(ref value) => {
+                        let tup: (#path::RawVal, #path::RawVal) = (#discriminant_const_sym_ident.into(), value.try_into_val(env)?);
+                        tup.try_into_val(env)
+                    }
+                };
                 let try_from_xdr = quote! {
                     #name => {
                         if iter.len() > 1 {
@@ -83,7 +88,7 @@ pub fn derive_type_enum(
                     }
                 };
                 let into_xdr = quote! { #enum_ident::#ident(value) => (#name, value).try_into().map_err(|_| #path::xdr::Error::Invalid)? };
-                (spec_case, discriminant_const, try_from, into, try_from_xdr, into_xdr)
+                (spec_case, discriminant_const, try_from, try_into, try_from_xdr, into_xdr)
             } else {
                 let spec_case = ScSpecUdtUnionCaseV0 {
                     name: name.try_into().unwrap_or_else(|_| StringM::default()),
@@ -97,7 +102,12 @@ pub fn derive_type_enum(
                         Self::#ident
                     }
                 };
-                let into = quote! { #enum_ident::#ident => (#discriminant_const_sym_ident,).into_val(env) };
+                let try_into = quote! {
+                    #enum_ident::#ident => {
+                        let tup: (#path::RawVal,) = (#discriminant_const_sym_ident.into(),);
+                        tup.try_into_val(env)
+                    }
+                };
                 let try_from_xdr = quote! {
                     #name => {
                         if iter.len() > 0 {
@@ -107,7 +117,7 @@ pub fn derive_type_enum(
                     }
                 };
                 let into_xdr = quote! { #enum_ident::#ident => (#name,).try_into().map_err(|_| #path::xdr::Error::Invalid)? };
-                (spec_case, discriminant_const, try_from, into, try_from_xdr, into_xdr)
+                (spec_case, discriminant_const, try_from, try_into, try_from_xdr, into_xdr)
             }
         })
         .multiunzip();
@@ -150,7 +160,7 @@ pub fn derive_type_enum(
         impl #path::TryFromVal<#path::Env, #path::RawVal> for #enum_ident {
             type Error = #path::ConversionError;
             #[inline(always)]
-            fn try_from_val(env: &#path::Env, val: #path::RawVal) -> Result<Self, Self::Error> {
+            fn try_from_val(env: &#path::Env, val: &#path::RawVal) -> Result<Self, Self::Error> {
                 use #path::TryIntoVal;
                 #(#discriminant_consts)*
                 let vec: #path::Vec<#path::RawVal> = val.try_into_val(env)?;
@@ -163,30 +173,14 @@ pub fn derive_type_enum(
             }
         }
 
-        impl #path::TryIntoVal<#path::Env, #enum_ident> for #path::RawVal {
+        impl #path::TryFromVal<#path::Env, #enum_ident> for #path::RawVal {
             type Error = #path::ConversionError;
             #[inline(always)]
-            fn try_into_val(self, env: &#path::Env) -> Result<#enum_ident, Self::Error> {
-                <_ as #path::TryFromVal<_, _>>::try_from_val(env, self)
-            }
-        }
-
-        impl #path::IntoVal<#path::Env, #path::RawVal> for #enum_ident {
-            #[inline(always)]
-            fn into_val(self, env: &#path::Env) -> #path::RawVal {
-                #(#discriminant_consts)*
-                match &self {
-                    #(#intos,)*
-                }
-            }
-        }
-
-        impl #path::IntoVal<#path::Env, #path::RawVal> for &#enum_ident {
-            #[inline(always)]
-            fn into_val(self, env: &#path::Env) -> #path::RawVal {
+            fn try_from_val(env: &#path::Env, val: &#enum_ident) -> Result<Self, Self::Error> {
+                use #path::TryIntoVal;
                 #(#discriminant_consts)*
-                match self {
-                    #(#intos,)*
+                match val {
+                    #(#try_intos,)*
                 }
             }
         }
@@ -195,7 +189,7 @@ pub fn derive_type_enum(
         impl #path::TryFromVal<#path::Env, #path::xdr::ScVec> for #enum_ident {
             type Error = #path::xdr::Error;
             #[inline(always)]
-            fn try_from_val(env: &#path::Env, val: #path::xdr::ScVec) -> Result<Self, Self::Error> {
+            fn try_from_val(env: &#path::Env, val: &#path::xdr::ScVec) -> Result<Self, Self::Error> {
                 use #path::xdr::Validate;
                 use #path::TryIntoVal;
 
@@ -211,20 +205,11 @@ pub fn derive_type_enum(
             }
         }
 
-        #[cfg(any(test, feature = "testutils"))]
-        impl #path::TryIntoVal<#path::Env, #enum_ident> for #path::xdr::ScVec {
-            type Error = #path::xdr::Error;
-            #[inline(always)]
-            fn try_into_val(self, env: &#path::Env) -> Result<#enum_ident, Self::Error> {
-                <_ as #path::TryFromVal<_, _>>::try_from_val(env, self)
-            }
-        }
-
         #[cfg(any(test, feature = "testutils"))]
         impl #path::TryFromVal<#path::Env, #path::xdr::ScObject> for #enum_ident {
             type Error = #path::xdr::Error;
             #[inline(always)]
-            fn try_from_val(env: &#path::Env, val: #path::xdr::ScObject) -> Result<Self, Self::Error> {
+            fn try_from_val(env: &#path::Env, val: &#path::xdr::ScObject) -> Result<Self, Self::Error> {
                 if let #path::xdr::ScObject::Vec(vec) = val {
                     <_ as #path::TryFromVal<_, _>>::try_from_val(env, vec)
                 } else {
@@ -233,20 +218,11 @@ pub fn derive_type_enum(
             }
         }
 
-        #[cfg(any(test, feature = "testutils"))]
-        impl #path::TryIntoVal<#path::Env, #enum_ident> for #path::xdr::ScObject {
-            type Error = #path::xdr::Error;
-            #[inline(always)]
-            fn try_into_val(self, env: &#path::Env) -> Result<#enum_ident, Self::Error> {
-                <_ as #path::TryFromVal<_, _>>::try_from_val(env, self)
-            }
-        }
-
         #[cfg(any(test, feature = "testutils"))]
         impl #path::TryFromVal<#path::Env, #path::xdr::ScVal> for #enum_ident {
             type Error = #path::xdr::Error;
             #[inline(always)]
-            fn try_from_val(env: &#path::Env, val: #path::xdr::ScVal) -> Result<Self, Self::Error> {
+            fn try_from_val(env: &#path::Env, val: &#path::xdr::ScVal) -> Result<Self, Self::Error> {
                 if let #path::xdr::ScVal::Object(Some(obj)) = val {
                     <_ as #path::TryFromVal<_, _>>::try_from_val(env, obj)
                 } else {
@@ -255,15 +231,6 @@ pub fn derive_type_enum(
             }
         }
 
-        #[cfg(any(test, feature = "testutils"))]
-        impl #path::TryIntoVal<#path::Env, #enum_ident> for #path::xdr::ScVal {
-            type Error = #path::xdr::Error;
-            #[inline(always)]
-            fn try_into_val(self, env: &#path::Env) -> Result<#enum_ident, Self::Error> {
-                <_ as #path::TryFromVal<_, _>>::try_from_val(env, self)
-            }
-        }
-
         #[cfg(any(test, feature = "testutils"))]
         impl TryInto<#path::xdr::ScVec> for &#enum_ident {
             type Error = #path::xdr::Error;