Merge branch 'main' into jsonevents

stellar · Sep 18, 2024 · b975d45 · b975d45
2 parents 9c6ec58 + 62ae1d7
commit b975d45
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ This repo is home to the Stellar CLI, the command-line multi-tool for running an
 ## Table of Contents
 
 - [Documentation](#documentation)
+- [Cookbook](#cookbook)
 - [Installation](#installation)
 - [Installation with Experimental Features](#installation-with-experimental-features)
 - [Autocomplete](#autocomplete)
@@ -23,6 +24,9 @@ This repo is home to the Stellar CLI, the command-line multi-tool for running an
 
 For installation options see below, for usage instructions [see the full help docs](FULL_HELP_DOCS.md).
 
+## Cookbook
+To understand how to get the most of the Stellar CLI, see the [Stellar CLI Cookbook](https://github.com/stellar/stellar-cli/tree/main/cookbook) for recipes and a collection of resources to teach you how to use the CLI. Examples of recipes included in the CLI cookbook include: send payments, manage contract lifecycle, extend contract instance/storage/wasm, and more.
+
 ## Installation
 Install the latest version from source:
 ```
@@ -76,4 +80,5 @@ Find issues to contribute to [here](https://github.com/stellar/stellar-cli/contr
 
 ## Additional Developer Resources
 - Developer Docs CLI Examples: https://developers.stellar.org/docs/smart-contracts/guides/cli
-- Video Tutorial: https://developers.stellar.org/meetings/2024/06/27
+- Video Tutorial on `network container`, `keys`, and `contract init`: https://developers.stellar.org/meetings/2024/06/27
+- Video Tutorial on `alias` and `snapshot`: https://developers.stellar.org/meetings/2024/09/12
diff --git a/cmd/crates/soroban-test/tests/it/build.rs b/cmd/crates/soroban-test/tests/it/build.rs
@@ -72,7 +72,7 @@ fn build_no_package_found() {
         .failure()
         .stderr(predicate::eq(
             "\
-error: package nopkgwiththisname not found
+❌ error: package nopkgwiththisname not found
 ",
         ));
 }

diff --git a/cmd/soroban-cli/src/utils/contract-init-template/contracts/hello_world/src/lib.rs b/cmd/soroban-cli/src/utils/contract-init-template/contracts/hello_world/src/lib.rs
@@ -2,10 +2,10 @@
 use soroban_sdk::{contract, contractimpl, vec, Env, String, Vec};
 
 #[contract]
-pub struct HelloContract;
+pub struct Contract;
 
 #[contractimpl]
-impl HelloContract {
+impl Contract {
     pub fn hello(env: Env, to: String) -> Vec<String> {
         vec![&env, String::from_str(&env, "Hello"), to]
     }

diff --git a/cmd/soroban-cli/src/utils/contract-init-template/contracts/hello_world/src/test.rs b/cmd/soroban-cli/src/utils/contract-init-template/contracts/hello_world/src/test.rs
@@ -6,8 +6,8 @@ use soroban_sdk::{vec, Env, String};
 #[test]
 fn test() {
     let env = Env::default();
-    let contract_id = env.register_contract(None, HelloContract);
-    let client = HelloContractClient::new(&env, &contract_id);
+    let contract_id = env.register_contract(None, Contract);
+    let client = ContractClient::new(&env, &contract_id);
 
     let words = client.hello(&String::from_str(&env, "Dev"));
     assert_eq!(