Add tests for repeated and comma-separated --uri parsing

Author: rockbmb

README.md

@@ -184,21 +184,29 @@ cargo build --features try-runtime --release && cp target/release/substrate .
 
 ```bash
 # Assuming local nodes are running (e.g., `./substrate --dev --tmp --ws-port 9999`).
-# Multiple --uri flags can be provided for parallel state download.
+# Multiple URIs can be provided for parallel state download, either
+# comma-separated or via repeated --uri flags.
 try-runtime \
     --runtime /path-to-substrate/target/release/wbuild/my-runtime.wasm \
     on-runtime-upgrade \
     --disable-mbm-checks \
     live \
-    --uri ws://localhost:9999 \
-    --uri ws://localhost:9998
+    --uri ws://localhost:9999,ws://localhost:9998
     ...
 ```
 
 To speed up state download, you can provide multiple URIs for parallel fetching:
 
 ```bash
 # assuming multiple substrate nodes running on ports 9999, 9998, 9997
+# comma-separated:
+try-runtime \
+    --runtime /path-to-substrate/target/release/wbuild/my-runtime.wasm \
+    on-runtime-upgrade \
+    live \
+    --uri ws://localhost:9999,ws://localhost:9998,ws://localhost:9997
+
+# or repeated flags:
 try-runtime \
     --runtime /path-to-substrate/target/release/wbuild/my-runtime.wasm \
     on-runtime-upgrade \
@@ -210,8 +218,8 @@ try-runtime \
 
 * Same as the previous example, but run it at specific block number's state and using the live
   polkadot network. This means that this block hash's state should not yet have been pruned by
-  the node running at `rpc.polkadot.io`. Multiple `--uri` flags can be provided for parallel
-  state download.
+  the node running at `rpc.polkadot.io`. Multiple URIs can be provided for parallel
+  state download (comma-separated or via repeated `--uri` flags).
 
 ```bash
 try-runtime \
@@ -236,8 +244,7 @@ For faster snapshot creation with large state, use multiple RPC endpoints:
 
 ```bash
 try-runtime --runtime existing create-snapshot \
-    --uri ws://localhost:9999 \
-    --uri ws://localhost:9998 \
+    --uri ws://localhost:9999,ws://localhost:9998 \
     -- my-snapshot.snap
 ```
 

cli/main.rs

@@ -200,21 +200,28 @@
 //!
 //! ```bash
 //! # Assuming local nodes are running (e.g., `./substrate --dev --tmp --ws-port 9999`).
-//! # Multiple --uri flags can be provided for parallel state download.
+//! # Multiple URIs can be provided for parallel state download, either
+//! # comma-separated or via repeated --uri flags.
 //! try-runtime \
 //!     --runtime /path-to-substrate/target/release/wbuild/my-runtime.wasm \
 //!     on-runtime-upgrade \
 //!     --disable-mbm-checks \
 //!     live \
-//!     --uri ws://localhost:9999 \
-//!     --uri ws://localhost:9998
+//!     --uri ws://localhost:9999,ws://localhost:9998
 //!     ...
 //! ```
 //!
 //! To speed up state download, you can provide multiple URIs for parallel fetching:
 //!
 //! ```bash
-//! # assuming multiple substrate nodes running on ports 9999, 9998, 9997
+//! # comma-separated:
+//! try-runtime \
+//!     --runtime /path-to-substrate/target/release/wbuild/my-runtime.wasm \
+//!     on-runtime-upgrade \
+//!     live \
+//!     --uri ws://localhost:9999,ws://localhost:9998,ws://localhost:9997
+//!
+//! # or repeated flags:
 //! try-runtime \
 //!     --runtime /path-to-substrate/target/release/wbuild/my-runtime.wasm \
 //!     on-runtime-upgrade \
@@ -226,8 +233,8 @@
 //!
 //! * Same as the previous example, but run it at specific block number's state and using the live
 //!   polkadot network. This means that this block hash's state should not yet have been pruned by
-//!   the node running at `rpc.polkadot.io`. Multiple `--uri` flags can be provided for parallel
-//!   state download.
+//!   the node running at `rpc.polkadot.io`. Multiple URIs can be provided for parallel
+//!   state download (comma-separated or via repeated `--uri` flags).
 //!
 //! ```bash
 //! try-runtime \
@@ -252,8 +259,7 @@
 //!
 //! ```bash
 //! try-runtime --runtime existing create-snapshot \
-//!     --uri ws://localhost:9999 \
-//!     --uri ws://localhost:9998 \
+//!     --uri ws://localhost:9999,ws://localhost:9998 \
 //!     -- my-snapshot.snap
 //! ```
 //!

core/src/common/state.rs

@@ -495,6 +495,7 @@ mod tests {
         state: State,
     }
 
+    /// Multiple URIs via repeated `--uri` flags.
     #[test]
     fn uri_repeated_flags() {
         let cli = TestCli::parse_from([
@@ -513,6 +514,7 @@ mod tests {
         }
     }
 
+    /// Multiple URIs via comma-separated value in a single `--uri`.
     #[test]
     fn uri_comma_separated() {
         let cli = TestCli::parse_from([
@@ -529,6 +531,33 @@ mod tests {
         }
     }
 
+    /// Mixing repeated flags with comma-separated values in a single invocation.
+    #[test]
+    fn uri_mixed_repeated_and_comma() {
+        let cli = TestCli::parse_from([
+            "test",
+            "live",
+            "--uri",
+            "ws://localhost:9999,ws://localhost:9998",
+            "--uri",
+            "ws://localhost:9997",
+        ]);
+        match cli.state {
+            State::Live(live) => {
+                assert_eq!(
+                    live.uri,
+                    vec![
+                        "ws://localhost:9999",
+                        "ws://localhost:9998",
+                        "ws://localhost:9997",
+                    ]
+                );
+            }
+            _ => panic!("expected Live variant"),
+        }
+    }
+
+    /// Single URI, the common case.
     #[test]
     fn uri_single_value() {
         let cli = TestCli::parse_from(["test", "live", "--uri", "wss://rpc.polkadot.io:443"]);
@@ -540,6 +569,7 @@ mod tests {
         }
     }
 
+    /// Arguments after `--uri` are not greedily consumed (the original bug).
     #[test]
     fn uri_positional_not_swallowed() {
         let cli = TestCli::parse_from([