fix: use testutils if the target isn't Wasm (#164)

There was an update to the soroban-sdk macros that made it necessary to always use testutils if not targetting wasm.

Author: willemneal

Cargo.lock

@@ -14,8 +14,9 @@ loam-soroban-sdk = { path = "./crates/loam-soroban-sdk" }
 loam-sdk-macro = { path = "./crates/loam-sdk-macro" }
 loam-subcontract-ft = { path = "./crates/loam-subcontract-ft" }
 
-soroban-sdk = { version = "21.2.0" }
-stellar-strkey = "0.0.8"
+soroban-sdk = "21.2.0"
+stellar-xdr = "21.2.0"
+stellar-strkey = "0.0.11"
 
 cargo_metadata = "0.18.1"
 thiserror = "1.0.38"

Cargo.toml

@@ -62,8 +62,8 @@ toml = { version = "0.8.12", features = ["parse", "preserve_order"] }
 rand = "0.8.5"
 wasm-gen = { version = "0.1.4" }
 notify = "6.1.1"
-stellar-strkey = "0.0.8"
-stellar-xdr = "21.0.0"
+stellar-strkey = { workspace = true }
+stellar-xdr = { workspace = true }
 rust-embed = { version = "8.2.0", features = ["debug-embed"] }
 regex = "1.10.5"
 toml_edit = "0.22.16"

crates/loam-cli/Cargo.toml

@@ -13,7 +13,7 @@ proc-macro = true
 [dependencies]
 loam-build = { path = "../loam-build", version = "0.7.3" }
 
-soroban-sdk = { workspace = true, features = ["testutils"] }
+stellar-xdr = { workspace = true, features = ["curr"] }
 stellar-strkey = { workspace = true }
 
 sha2 = { workspace = true }

crates/loam-cli/tests/fixtures/soroban-init-boilerplate/Cargo.toml

@@ -2,7 +2,7 @@ use std::{collections::BTreeMap, path::Path};
 
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
-use soroban_sdk::xdr;
+use stellar_xdr::curr as xdr;
 use syn::{File, ItemTrait, TraitItemFn};
 
 /// Read a crate starting from a single file then parse into a file
@@ -128,35 +128,18 @@ pub fn parse_asset(str: &str) -> Result<xdr::Asset, xdr::Error> {
     let split: Vec<&str> = str.splitn(2, ':').collect();
     assert!(split.len() == 2, "invalid asset \"{str}\"");
     let code = split[0];
-    let issuer = split[1];
+    let issuer: xdr::AccountId = split[1].parse()?;
     let re = regex::Regex::new("^[[:alnum:]]{1,12}$").expect("regex failed");
     assert!(re.is_match(code), "invalid asset \"{str}\"");
-    if code.len() <= 4 {
-        let mut asset_code: [u8; 4] = [0; 4];
-        for (i, b) in code.as_bytes().iter().enumerate() {
-            asset_code[i] = *b;
+    let asset_code: xdr::AssetCode = code.parse()?;
+    Ok(match asset_code {
+        xdr::AssetCode::CreditAlphanum4(asset_code) => {
+            xdr::Asset::CreditAlphanum4(xdr::AlphaNum4 { asset_code, issuer })
         }
-        Ok(xdr::Asset::CreditAlphanum4(xdr::AlphaNum4 {
-            asset_code: xdr::AssetCode4(asset_code),
-            issuer: parse_account_id(issuer)?,
-        }))
-    } else {
-        let mut asset_code: [u8; 12] = [0; 12];
-        for (i, b) in code.as_bytes().iter().enumerate() {
-            asset_code[i] = *b;
+        xdr::AssetCode::CreditAlphanum12(asset_code) => {
+            xdr::Asset::CreditAlphanum12(xdr::AlphaNum12 { asset_code, issuer })
         }
-        Ok(xdr::Asset::CreditAlphanum12(xdr::AlphaNum12 {
-            asset_code: xdr::AssetCode12(asset_code),
-            issuer: parse_account_id(issuer)?,
-        }))
-    }
-}
-
-pub fn parse_account_id(str: &str) -> Result<xdr::AccountId, stellar_strkey::DecodeError> {
-    let pk_bytes = stellar_strkey::ed25519::PublicKey::from_string(str)?.0;
-    Ok(xdr::AccountId(xdr::PublicKey::PublicKeyTypeEd25519(
-        pk_bytes.into(),
-    )))
+    })
 }
 
 // Generate the code to read the STELLAR_NETWORK environment variable

crates/loam-cli/tests/fixtures/soroban-init-boilerplate/contracts/token/Cargo.toml

@@ -16,6 +16,8 @@ crate-type = ["rlib"]
 loam-sdk-macro = { path = "../loam-sdk-macro", version = "0.8.4" }
 loam-soroban-sdk = { path = "../loam-soroban-sdk", version = "0.6.15", optional = true }
 
+[target.'cfg(not(target_family="wasm"))'.dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"], optional = true }
 
 [features]
 default = ["loam-soroban-sdk"]

crates/loam-sdk-macro/Cargo.toml

@@ -14,7 +14,10 @@ crate-type = ["rlib"]
 
 [dependencies]
 loam-sdk-macro = { path = "../loam-sdk-macro", version = "0.8.4" }
-soroban-sdk = { workspace = true }
+soroban-sdk = { workspace = true, default-features = false }
+
+[target.'cfg(not(target_family="wasm"))'.dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
 
 
 [features]