test

Author: ndr-ds

.github/workflows/rust.yml

@@ -127,7 +127,7 @@ jobs:
       run: |
         mkdir /tmp/local-linera-net
         FAUCET_PORT=$(echo "$LINERA_FAUCET_URL" | cut -d: -f3)
-        cargo run --bin linera --features kubernetes -- net up --kubernetes --policy-config testnet --path /tmp/local-linera-net --validators 2 --shards 2 --with-faucet --faucet-port $FAUCET_PORT --faucet-amount 1000 &
+        cargo run --bin linera --features kubernetes -- net up --kubernetes --policy-config testnet --path /tmp/local-linera-net --validators 1 --shards 2 --with-faucet --faucet-port $FAUCET_PORT --faucet-amount 100 &
     - name: Wait for faucet to be ready
       run: |
         until curl -s $LINERA_FAUCET_URL >/dev/null; do sleep 1; done

linera-service/src/cli/net_up_utils.rs

@@ -317,18 +317,23 @@ async fn print_messages_and_create_faucet(
 
     // Run the faucet,
     let faucet_service = if with_faucet {
-        let faucet_chain_idx = faucet_chain.unwrap_or(0);
-        assert!(
-            num_other_initial_chains > faucet_chain_idx,
-            "num_other_initial_chains must be strictly greater than the faucet chain index if \
+        let faucet_chain = if let Some(faucet_chain_idx) = faucet_chain {
+            assert!(
+                num_other_initial_chains > faucet_chain_idx,
+                "num_other_initial_chains must be strictly greater than the faucet chain index if \
             with_faucet is true"
-        );
-        // This picks a lexicographically faucet_chain_idx-th non-admin chain.
-        let faucet_chain = chains
-            .into_iter()
-            .filter(|chain_id| *chain_id != wallet.genesis_admin_chain())
-            .nth(faucet_chain_idx as usize)
-            .unwrap(); // we checked that there are enough chains above, so this should be safe
+            );
+            // This picks a lexicographically faucet_chain_idx-th non-admin chain.
+            Some(
+                chains
+                    .into_iter()
+                    .filter(|chain_id| *chain_id != wallet.genesis_admin_chain())
+                    .nth(faucet_chain_idx as usize)
+                    .unwrap(),
+            ) // we checked that there are enough chains above, so this should be safe
+        } else {
+            None
+        };
         let service = client
             .run_faucet(Some(faucet_port.into()), faucet_chain, faucet_amount)
             .await?;

linera-service/src/cli_wrappers/wallet.rs

@@ -540,17 +540,19 @@ impl ClientWrapper {
     pub async fn run_faucet(
         &self,
         port: impl Into<Option<u16>>,
-        chain_id: ChainId,
+        chain_id: Option<ChainId>,
         amount: Amount,
     ) -> Result<FaucetService> {
         let port = port.into().unwrap_or(8080);
         let mut command = self.command().await?;
-        let child = command
+        let command = command
             .arg("faucet")
-            .arg(chain_id.to_string())
             .args(["--port".to_string(), port.to_string()])
-            .args(["--amount".to_string(), amount.to_string()])
-            .spawn_into()?;
+            .args(["--amount".to_string(), amount.to_string()]);
+        if let Some(chain_id) = chain_id {
+            command.arg(chain_id.to_string());
+        }
+        let child = command.spawn_into()?;
         let client = reqwest_client();
         for i in 0..10 {
             linera_base::time::timer::sleep(Duration::from_secs(i)).await;