Skip to content

Commit 9536e4c

Browse files
committed
Fix test; take rest if balance too low.
1 parent a18e17b commit 9536e4c

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

linera-faucet/server/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ where
129129
.await
130130
.make_chain_client(self.main_chain_id)?;
131131
let maybe_tmp_chain_id = *self.tmp_chain_id.lock().await;
132+
let main_balance = main_client.local_balance().await?;
132133
let tmp_chain_id = match maybe_tmp_chain_id {
133134
Some(tmp_chain_id) => tmp_chain_id,
134135
None => {
@@ -137,7 +138,8 @@ where
137138
.amount
138139
.try_add(MAX_FEE)?
139140
.try_mul(u128::from(self.max_claims_per_chain))?
140-
.try_add(MAX_FEE)?; // One more block fee for closing the chain.
141+
.try_add(MAX_FEE)? // One more block fee for closing the chain.
142+
.min(main_balance.try_sub(MAX_FEE)?);
141143
let ownership = main_client.chain_state_view().await?.ownership().clone();
142144
let (message_id, certificate) = main_client
143145
.open_chain(ownership, ApplicationPermissions::default(), balance)

linera-service/tests/linera_net_tests.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2861,8 +2861,9 @@ async fn test_end_to_end_faucet(config: impl LineraNetConfig) -> Result<()> {
28612861
// Generate keys for client 2.
28622862
let owner2 = client2.keygen().await?;
28632863

2864+
// We set the temporary chain limit to 1, so unused tokens remain on the main chain.
28642865
let mut faucet_service = client1
2865-
.run_faucet(None, chain1, Amount::from_tokens(2), None)
2866+
.run_faucet(None, chain1, Amount::from_tokens(2), Some(1))
28662867
.await?;
28672868
let faucet = faucet_service.instance();
28682869
let outcome = faucet.claim(&owner2).await?;

0 commit comments

Comments
 (0)