Several corrections to the error handling. (#3981)

## Motivation

Several corrections are done to the error handling.

## Proposal

The following unrelated simple changes are made:
* Removal of `InactiveLocalChain` which is never used.
* Addition of the size to `BlockTooLarge`.
* Addition of the timestamp to the timestamp errors.
* The `InactiveChain` of the `ExecutionError` now contains a specific
`ChainId`.
* The ChainId of the `InactiveChain` is now printed as `{0}`, no longer
as `{0:?}`.

## Test Plan

The CI.

## Release Plan

- Nothing to do / These changes follow the usual release cycle.

## Links

None.

Author: MathieuDutSik

linera-chain/src/chain.rs

@@ -866,9 +866,13 @@ where
 
         self.ensure_is_active(local_time).await?;
 
+        let chain_timestamp = *self.execution_state.system.timestamp.get();
         ensure!(
-            *self.execution_state.system.timestamp.get() <= block.timestamp,
-            ChainError::InvalidBlockTimestamp
+            chain_timestamp <= block.timestamp,
+            ChainError::InvalidBlockTimestamp {
+                parent: chain_timestamp,
+                new: block.timestamp
+            }
         );
         ensure!(
             !block.incoming_bundles.is_empty() || !block.operations.is_empty(),

linera-chain/src/data_types.rs

@@ -118,7 +118,7 @@ impl ProposedBlock {
         let size = bcs::serialized_size(self)?;
         ensure!(
             size <= usize::try_from(maximum_block_proposal_size).unwrap_or(usize::MAX),
-            ChainError::BlockProposalTooLarge
+            ChainError::BlockProposalTooLarge(size)
         );
         Ok(())
     }

linera-chain/src/lib.rs

@@ -46,7 +46,7 @@ pub enum ChainError {
     #[error("Execution error: {0} during {1:?}")]
     ExecutionError(Box<ExecutionError>, ChainExecutionContext),
 
-    #[error("The chain being queried is not active {0:?}")]
+    #[error("The chain being queried is not active {0}")]
     InactiveChain(ChainId),
     #[error(
         "Cannot vote for block proposal of chain {chain_id:?} because a message \
@@ -119,8 +119,10 @@ pub enum ChainError {
     UnexpectedPreviousBlockHash,
     #[error("Sequence numbers above the maximal value are not usable for blocks")]
     InvalidBlockHeight,
-    #[error("Block timestamp must not be earlier than the parent block's.")]
-    InvalidBlockTimestamp,
+    #[error(
+        "Block timestamp {new} must not be earlier than the parent block's timestamp {parent}"
+    )]
+    InvalidBlockTimestamp { parent: Timestamp, new: Timestamp },
     #[error("Cannot initiate a new block while the previous one is still pending confirmation")]
     PreviousBlockMustBeConfirmedFirst,
     #[error("Round number should be at least {0:?}")]
@@ -143,8 +145,8 @@ pub enum ChainError {
     CertificateSignatureVerificationFailed { error: String },
     #[error("Internal error {0}")]
     InternalError(String),
-    #[error("Block proposal is too large")]
-    BlockProposalTooLarge,
+    #[error("Block proposal has size {0} which is too large")]
+    BlockProposalTooLarge(usize),
     #[error(transparent)]
     BcsError(#[from] bcs::Error),
     #[error("Insufficient balance to pay the fees")]

linera-core/src/client/mod.rs

@@ -292,6 +292,8 @@ impl<Env: Environment> Client<Env> {
         match self.local_node.chain_info(chain_id).await {
             Ok(info) => Ok(info),
             Err(LocalNodeError::BlobsNotFound(blob_ids)) => {
+                // If the chain is missing then the error is a WorkerError
+                // and so a BlobsNotFound
                 // TODO(#2351): make sure the blobs are legitimate!
                 let blobs =
                     RemoteNode::download_blobs(&blob_ids, validators, self.blob_download_timeout)

linera-core/src/local_node.rs

@@ -63,7 +63,7 @@ pub enum LocalNodeError {
     #[error("Failed to read blob {blob_id:?} of chain {chain_id:?}")]
     CannotReadLocalBlob { chain_id: ChainId, blob_id: BlobId },
 
-    #[error("The local node doesn't have an active chain {0:?}")]
+    #[error("The local node doesn't have an active chain {0}")]
     InactiveChain(ChainId),
 
     #[error("The chain info response received from the local node is invalid")]

linera-core/src/node.rs

@@ -195,7 +195,7 @@ pub enum NodeError {
     WorkerError { error: String },
 
     // This error must be normalized during conversions.
-    #[error("The chain {0:?} is not active in validator")]
+    #[error("The chain {0} is not active in validator")]
     InactiveChain(ChainId),
 
     // This error must be normalized during conversions.
@@ -222,11 +222,6 @@ pub enum NodeError {
     #[error("Validator's response to block proposal failed to include a vote")]
     MissingVoteInValidatorResponse,
 
-    #[error(
-        "Failed to update validator because our local node doesn't have an active chain {0:?}"
-    )]
-    InactiveLocalChain(ChainId),
-
     #[error("The received chain info response is invalid")]
     InvalidChainInfoResponse,
     #[error("Unexpected certificate value")]

linera-core/src/unit_tests/client_tests.rs

@@ -2502,7 +2502,7 @@ where
         result,
         Err(ChainClientError::LocalNodeError(
             LocalNodeError::WorkerError(WorkerError::ChainError(chain_error))
-        )) if matches!(*chain_error, ChainError::BlockProposalTooLarge)
+        )) if matches!(*chain_error, ChainError::BlockProposalTooLarge(_))
     );
 
     assert_matches!(

linera-core/src/unit_tests/worker_tests.rs

@@ -689,7 +689,7 @@ where
         assert_matches!(
             env.worker().handle_block_proposal(block_proposal).await,
             Err(WorkerError::ChainError(error))
-                if matches!(*error, ChainError::InvalidBlockTimestamp)
+                if matches!(*error, ChainError::InvalidBlockTimestamp { .. })
         );
     }
     Ok(())

linera-execution/src/lib.rs

@@ -281,6 +281,8 @@ pub enum ExecutionError {
     ContractModuleSend(#[from] linera_base::task::SendError<UserContractCode>),
     #[error("Failed to send service code to worker thread: {0:?}")]
     ServiceModuleSend(#[from] linera_base::task::SendError<UserServiceCode>),
+    #[error("The chain being queried is not active {0}")]
+    InactiveChain(ChainId),
     #[error("Blobs not found: {0:?}")]
     BlobsNotFound(Vec<BlobId>),
     #[error("Events not found: {0:?}")]
@@ -330,8 +332,6 @@ pub enum ExecutionError {
     TicksOutOfOrder,
     #[error("Application {0:?} is not registered by the chain")]
     UnknownApplicationId(Box<ApplicationId>),
-    #[error("Chain is not active yet.")]
-    InactiveChain,
     #[error("No recorded response for oracle query")]
     MissingOracleResponse,
     #[error("process_streams was not called for all stream updates")]

linera-execution/src/system.rs

@@ -515,7 +515,7 @@ where
                 let admin_id = self
                     .admin_id
                     .get()
-                    .ok_or_else(|| ExecutionError::InactiveChain)?;
+                    .ok_or_else(|| ExecutionError::InactiveChain(context.chain_id))?;
                 let event_id = EventId {
                     chain_id: admin_id,
                     stream_id: StreamId::system(EPOCH_STREAM_NAME),
@@ -545,7 +545,7 @@ where
                 let admin_id = self
                     .admin_id
                     .get()
-                    .ok_or_else(|| ExecutionError::InactiveChain)?;
+                    .ok_or_else(|| ExecutionError::InactiveChain(context.chain_id))?;
                 let event_id = EventId {
                     chain_id: admin_id,
                     stream_id: StreamId::system(REMOVED_EPOCH_STREAM_NAME),