test: patch various rpc tests and remove unnecessary ones

Author: mootz12

cmd/crates/soroban-test/src/lib.rs

@@ -392,6 +392,7 @@ impl AssertExt for Assert {
             .to_owned()
     }
 }
+
 pub trait CommandExt {
     fn json_arg<A>(&mut self, j: A) -> &mut Self
     where

cmd/crates/soroban-test/tests/it/init.rs

@@ -3,7 +3,6 @@ use predicates::prelude::predicate;
 use soroban_test::TestEnv;
 
 #[test]
-#[ignore = "We need to ignore these until soroban-sdk is 23.0.0 stable"]
 fn init() {
     let sandbox = TestEnv::default();
     let cli_version = soroban_cli::commands::version::pkg();
@@ -21,11 +20,11 @@ fn init() {
         .assert(predicate::function(|c: &str| {
             let table = toml::from_str::<toml::Table>(c).unwrap();
             let sdk_version = table["workspace"]["dependencies"]["soroban-sdk"].as_str();
-            println!("Check expected version {major}.0.0 matches template's {sdk_version:?}");
+            println!("Check expected version {major} matches template's {sdk_version:?}");
             if is_rc {
-                sdk_version.and_then(|x| x.split('-').next()) == Some(&format!("{major}.0.0"))
+                sdk_version.and_then(|x| x.split('-').next()) == Some(major)
             } else {
-                sdk_version == Some(&format!("{major}.0.0"))
+                sdk_version == Some(major)
             }
         }));
 }

cmd/crates/soroban-test/tests/it/integration.rs

@@ -13,4 +13,3 @@ mod secure_store;
 mod snapshot;
 mod tx;
 mod util;
-mod wrap;

cmd/crates/soroban-test/tests/it/integration/custom_types.rs

@@ -44,6 +44,9 @@ async fn parse() {
     contract_address(sandbox, id).await;
     contract_address_with_alias(sandbox, id).await;
     bytes(sandbox, id).await;
+    bytes_n(sandbox, id).await;
+    timepoint(sandbox, id).await;
+    duration(sandbox, id).await;
     const_enum(sandbox, id).await;
     number_arg_return_ok(sandbox, id);
     void(sandbox, id);
@@ -275,6 +278,39 @@ async fn bytes(sandbox: &TestEnv, id: &str) {
     invoke_with_roundtrip(sandbox, id, "bytes", json!("7374656c6c6172")).await;
 }
 
+async fn bytes_n(sandbox: &TestEnv, id: &str) {
+    let bytes = "beeffacebeefface00";
+    invoke_custom(sandbox, id, "bytes_n")
+        .arg("--bytes_n")
+        .arg(bytes)
+        .assert()
+        .success()
+        .stdout(format!(
+            r#""{bytes}"
+"#,
+        ));
+}
+
+async fn timepoint(sandbox: &TestEnv, id: &str) {
+    let tp = "1633046400";
+    invoke_custom(sandbox, id, "timepoint")
+        .arg("--timepoint")
+        .arg(tp)
+        .assert()
+        .success()
+        .stdout(format!("{tp}\n"));
+}
+
+async fn duration(sandbox: &TestEnv, id: &str) {
+    let dur = "3600";
+    invoke_custom(sandbox, id, "duration")
+        .arg("--duration")
+        .arg(dur)
+        .assert()
+        .success()
+        .stdout(format!("{dur}\n"));
+}
+
 async fn const_enum(sandbox: &TestEnv, id: &str) {
     invoke_with_roundtrip(sandbox, id, "card", "11").await;
 }

cmd/crates/soroban-test/tests/it/integration/hello_world.rs

@@ -7,7 +7,7 @@ use soroban_cli::{
 };
 use soroban_test::{AssertExt, TestEnv, LOCAL_NETWORK_PASSPHRASE};
 
-use super::util::{deploy_hello, extend, HELLO_WORLD};
+use super::util::{deploy_hello, extend};
 use crate::integration::util::extend_contract;
 
 #[allow(clippy::too_many_lines)]
@@ -317,26 +317,6 @@ async fn contract_data_read() {
         .stdout(predicates::str::starts_with("COUNTER,2"));
 }
 
-#[tokio::test]
-#[ignore]
-async fn half_max_instructions() {
-    let sandbox = TestEnv::new();
-    let wasm = HELLO_WORLD;
-    sandbox
-        .new_assert_cmd("contract")
-        .arg("deploy")
-        .arg("--fee")
-        .arg("1000000")
-        .arg("--instructions")
-        .arg((u32::MAX / 2).to_string())
-        .arg("--wasm")
-        .arg(wasm.path())
-        .arg("--ignore-checks")
-        .assert()
-        .stderr("")
-        .stdout_as_str();
-}
-
 async fn invoke_with_seed(sandbox: &TestEnv, id: &str, seed_phrase: &str) {
     invoke_with_source(sandbox, seed_phrase, id).await;
 }

cmd/crates/soroban-test/tests/it/integration/init.rs

@@ -1,10 +1,9 @@
 use soroban_test::{AssertExt, TestEnv};
 
 #[test]
-#[ignore]
 fn init_and_deploy() {
     let name = "hello_world";
-    let sandbox = TestEnv::default();
+    let sandbox = &TestEnv::new();
 
     sandbox
         .new_assert_cmd("contract")

cmd/crates/soroban-test/tests/it/integration/ledger/entry.rs

@@ -221,8 +221,7 @@ async fn ledger_entry_contract_data() {
         .assert()
         .success()
         .stdout_as_str();
-    let parsed_key_output: FullLedgerEntries =
-        serde_json::from_str(&key_output).expect("Failed to parse JSON");
+    let parsed_key_output: FullLedgerEntries = serde_json::from_str(&key_output).unwrap();
     assert!(!parsed_key_output.entries.is_empty());
 
     // get entry by key xdr
@@ -240,9 +239,7 @@ async fn ledger_entry_contract_data() {
         .assert()
         .success()
         .stdout_as_str();
-
-    let parsed_key_xdr_output: FullLedgerEntries =
-        serde_json::from_str(&key_xdr_output).expect("Failed to parse JSON");
+    let parsed_key_xdr_output: FullLedgerEntries = serde_json::from_str(&key_xdr_output).unwrap();
     assert!(!parsed_key_xdr_output.entries.is_empty());
 
     let expected_contract_data_key = expected_contract_ledger_key(&contract_id, storage_key).await;
@@ -264,6 +261,33 @@ async fn ledger_entry_contract_data() {
 
     // the output should be the same regardless of key format
     assert_eq!(parsed_key_output.entries, parsed_key_xdr_output.entries);
+
+    // get instance data entry
+    let instance_output = sandbox
+        .new_assert_cmd("ledger")
+        .arg("entry")
+        .arg("fetch")
+        .arg("contract-data")
+        .arg("--contract")
+        .arg(&contract_id)
+        .arg("--network")
+        .arg("testnet")
+        .arg("--instance")
+        .assert()
+        .success()
+        .stdout_as_str();
+    let parsed_instance_output: FullLedgerEntries = serde_json::from_str(&instance_output).unwrap();
+    let expected_instance_key = LedgerKey::ContractData(LedgerKeyContractData {
+        contract: ScAddress::Contract(Hash(Contract::from_string(&contract_id).unwrap().0).into()),
+        key: ScVal::LedgerKeyContractInstance,
+        durability: ContractDataDurability::Persistent,
+    });
+    assert!(!parsed_instance_output.entries.is_empty());
+    assert_eq!(parsed_instance_output.entries[0].key, expected_instance_key);
+    assert!(matches!(
+        parsed_instance_output.entries[0].val,
+        LedgerEntryData::ContractData { .. }
+    ));
 }
 
 // top level test