Listen to all the chains in the wallet (linera-io#1058)

* add UserChain::make_other * listen to all chains in the Wallet
MathieuDutSik · Oct 31, 2023 · 96ea105 · 96ea105
1 parent 97aa2d7
commit 96ea105
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/linera-service/src/chain_listener.rs b/linera-service/src/chain_listener.rs
@@ -80,7 +80,7 @@ where
     where
         C: ClientContext<P> + Send + 'static,
     {
-        let chain_ids = context.wallet_state().own_chain_ids();
+        let chain_ids = context.wallet_state().chain_ids();
         let context = Arc::new(Mutex::new(context));
         for chain_id in chain_ids {
             Self::run_with_chain_id(

diff --git a/linera-service/src/config.rs b/linera-service/src/config.rs
@@ -121,6 +121,17 @@ impl UserChain {
             next_block_height: BlockHeight::ZERO,
         }
     }
+
+    /// Creates an entry for a chain that we don't own.
+    pub fn make_other(description: ChainDescription, timestamp: Timestamp) -> Self {
+        Self {
+            chain_id: description.into(),
+            key_pair: None,
+            block_hash: None,
+            timestamp,
+            next_block_height: BlockHeight::ZERO,
+        }
+    }
 }
 
 /// A wrapper around `InnerWalletState` which owns a [`FileLock`] to prevent

diff --git a/linera-service/src/linera.rs b/linera-service/src/linera.rs
@@ -1092,7 +1092,7 @@ enum WalletCommand {
         #[structopt(long = "genesis")]
         genesis_config_path: PathBuf,
 
-        // Other chains to follow.
+        /// Other chains to follow.
         #[structopt(long)]
         with_other_chains: Vec<ChainId>,
 
@@ -2052,24 +2052,18 @@ async fn main() -> Result<(), anyhow::Error> {
                 testing_prng_seed,
             } => {
                 let genesis_config = GenesisConfig::read(genesis_config_path)?;
-                let mut rng = Box::<dyn CryptoRng>::from(*testing_prng_seed);
                 let chains = with_other_chains
                     .iter()
                     .filter_map(|chain_id| {
                         let (description, _, _, timestamp) = genesis_config
                             .chains
                             .iter()
                             .find(|(desc, _, _, _)| ChainId::from(*desc) == *chain_id)?;
-                        Some(UserChain::make_initial(&mut rng, *description, *timestamp))
+                        Some(UserChain::make_other(*description, *timestamp))
                     })
                     .collect();
-                let new_prng_seed = if testing_prng_seed.is_some() {
-                    Some(rng.gen())
-                } else {
-                    None
-                };
                 let mut context =
-                    ClientContext::create(&options, genesis_config, new_prng_seed, chains)?;
+                    ClientContext::create(&options, genesis_config, *testing_prng_seed, chains)?;
                 context.save_wallet();
                 options.initialize_storage().await?;
                 Ok(())