From f44ca87f56273c67acc39c4d7e6e61d616265e6e Mon Sep 17 00:00:00 2001
From: Gleb <gleb@stellar.org>
Date: Thu, 25 Jul 2024 15:15:05 -0700
Subject: [PATCH 1/3] Clean cargo warnings

---
 .gitignore                                                     | 3 ++-
 cmd/crates/soroban-spec-json/Cargo.toml                        | 2 +-
 cmd/crates/soroban-spec-typescript/Cargo.toml                  | 2 +-
 .../soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml     | 2 +-
 .../soroban-test/tests/fixtures/test-wasms/token/Cargo.toml    | 2 +-
 cmd/soroban-cli/Cargo.toml                                     | 2 +-
 cmd/stellar-cli/Cargo.toml                                     | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3df1cd5f..74abdb3f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ captive-core/
 !test.toml
 *.sqlite
 test_snapshots
-.vscode/settings.json
\ No newline at end of file
+.vscode/settings.json
+.idea
diff --git a/cmd/crates/soroban-spec-json/Cargo.toml b/cmd/crates/soroban-spec-json/Cargo.toml
index 04051ea6b..b13012a2e 100644
--- a/cmd/crates/soroban-spec-json/Cargo.toml
+++ b/cmd/crates/soroban-spec-json/Cargo.toml
@@ -22,5 +22,5 @@ sha2 = "0.9.9"
 workspace = true
 features = ["curr", "std", "serde"]
 
-[dev_dependencies]
+[dev-dependencies]
 pretty_assertions = "1.2.1"
diff --git a/cmd/crates/soroban-spec-typescript/Cargo.toml b/cmd/crates/soroban-spec-typescript/Cargo.toml
index cc17073fb..f856f76ef 100644
--- a/cmd/crates/soroban-spec-typescript/Cargo.toml
+++ b/cmd/crates/soroban-spec-typescript/Cargo.toml
@@ -27,7 +27,7 @@ base64 = { workspace = true }
 workspace = true
 features = ["curr", "std", "serde", "base64"]
 
-[dev_dependencies]
+[dev-dependencies]
 temp-dir = "0.1.11"
 pretty_assertions = "1.2.1"
 walkdir = "2.3.3"
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
index f2465e22b..f74201a31 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/swap/Cargo.toml
@@ -14,5 +14,5 @@ doctest = false
 [dependencies]
 soroban-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
diff --git a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
index 3f32f139a..880c39d52 100644
--- a/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
+++ b/cmd/crates/soroban-test/tests/fixtures/test-wasms/token/Cargo.toml
@@ -15,5 +15,5 @@ crate-type = ["cdylib"]
 soroban-sdk = { workspace = true }
 soroban-token-sdk = { workspace = true }
 
-[dev_dependencies]
+[dev-dependencies]
 soroban-sdk = { workspace = true, features = ["testutils"] }
diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index 6d40ddd90..52b4bef7f 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -14,7 +14,7 @@ default-run = "soroban"
 
 [[bin]]
 name = "stellar"
-path = "src/bin/main.rs"
+path = "../stellar-cli/src/bin/main.rs"
 
 [[bin]]
 name = "soroban"
diff --git a/cmd/stellar-cli/Cargo.toml b/cmd/stellar-cli/Cargo.toml
index c5d93252b..e751b0e22 100644
--- a/cmd/stellar-cli/Cargo.toml
+++ b/cmd/stellar-cli/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/bin/main.rs"
 
 [[bin]]
 name = "soroban"
-path = "src/bin/main.rs"
+path = "../soroban-cli/src/bin/main.rs"
 
 [package.metadata.binstall]
 pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ version }-{ target }{ archive-suffix }"

From b1cce427ead65dbf9c834248131e78c2d981e9fe Mon Sep 17 00:00:00 2001
From: Gleb <gleb@stellar.org>
Date: Thu, 25 Jul 2024 15:50:58 -0700
Subject: [PATCH 2/3] Copy files instead of referencing

---
 cmd/soroban-cli/Cargo.toml         | 4 ++--
 cmd/soroban-cli/src/bin/soroban.rs | 3 +++
 cmd/stellar-cli/Cargo.toml         | 2 +-
 cmd/stellar-cli/src/bin/soroban.rs | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 cmd/soroban-cli/src/bin/soroban.rs
 create mode 100644 cmd/stellar-cli/src/bin/soroban.rs

diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index 52b4bef7f..3c7a32494 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -14,11 +14,11 @@ default-run = "soroban"
 
 [[bin]]
 name = "stellar"
-path = "../stellar-cli/src/bin/main.rs"
+path = "src/bin/main.rs"
 
 [[bin]]
 name = "soroban"
-path = "src/bin/main.rs"
+path = "src/bin/soroban.rs"
 
 [package.metadata.binstall]
 pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ version }-{ target }{ archive-suffix }"
diff --git a/cmd/soroban-cli/src/bin/soroban.rs b/cmd/soroban-cli/src/bin/soroban.rs
new file mode 100644
index 000000000..27a46b76a
--- /dev/null
+++ b/cmd/soroban-cli/src/bin/soroban.rs
@@ -0,0 +1,3 @@
+fn main() {
+    soroban_cli::main();
+}
diff --git a/cmd/stellar-cli/Cargo.toml b/cmd/stellar-cli/Cargo.toml
index e751b0e22..353115be0 100644
--- a/cmd/stellar-cli/Cargo.toml
+++ b/cmd/stellar-cli/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/bin/main.rs"
 
 [[bin]]
 name = "soroban"
-path = "../soroban-cli/src/bin/main.rs"
+path = "src/bin/soroban.rs"
 
 [package.metadata.binstall]
 pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ version }-{ target }{ archive-suffix }"
diff --git a/cmd/stellar-cli/src/bin/soroban.rs b/cmd/stellar-cli/src/bin/soroban.rs
new file mode 100644
index 000000000..27a46b76a
--- /dev/null
+++ b/cmd/stellar-cli/src/bin/soroban.rs
@@ -0,0 +1,3 @@
+fn main() {
+    soroban_cli::main();
+}

From 361ec8a7497758e91898db0d5edef8404b3a8541 Mon Sep 17 00:00:00 2001
From: Gleb <gleb@stellar.org>
Date: Thu, 25 Jul 2024 16:20:54 -0700
Subject: [PATCH 3/3] Rename files

---
 cmd/soroban-cli/Cargo.toml                      | 2 +-
 cmd/soroban-cli/src/bin/{main.rs => stellar.rs} | 0
 cmd/stellar-cli/Cargo.toml                      | 2 +-
 cmd/stellar-cli/src/bin/{main.rs => stellar.rs} | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename cmd/soroban-cli/src/bin/{main.rs => stellar.rs} (100%)
 rename cmd/stellar-cli/src/bin/{main.rs => stellar.rs} (100%)

diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index 3c7a32494..a1c5712dc 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -14,7 +14,7 @@ default-run = "soroban"
 
 [[bin]]
 name = "stellar"
-path = "src/bin/main.rs"
+path = "src/bin/stellar.rs"
 
 [[bin]]
 name = "soroban"
diff --git a/cmd/soroban-cli/src/bin/main.rs b/cmd/soroban-cli/src/bin/stellar.rs
similarity index 100%
rename from cmd/soroban-cli/src/bin/main.rs
rename to cmd/soroban-cli/src/bin/stellar.rs
diff --git a/cmd/stellar-cli/Cargo.toml b/cmd/stellar-cli/Cargo.toml
index 353115be0..1440ce094 100644
--- a/cmd/stellar-cli/Cargo.toml
+++ b/cmd/stellar-cli/Cargo.toml
@@ -14,7 +14,7 @@ default-run = "stellar"
 
 [[bin]]
 name = "stellar"
-path = "src/bin/main.rs"
+path = "src/bin/stellar.rs"
 
 [[bin]]
 name = "soroban"
diff --git a/cmd/stellar-cli/src/bin/main.rs b/cmd/stellar-cli/src/bin/stellar.rs
similarity index 100%
rename from cmd/stellar-cli/src/bin/main.rs
rename to cmd/stellar-cli/src/bin/stellar.rs