Store PayloadStatus within WithStatus struct.

Author: Tumas

fork_choice_control/src/helpers.rs

@@ -505,7 +505,8 @@ impl<P: Preset> Context<P> {
                 .check_block_root(block.message().hash_tree_root())
                 .expect("no storage errors should occur")
                 .expect("block should be present in the store")
-                .optimistic,
+                .status
+                .is_optimistic(),
             expected_optimistic,
         );
     }

fork_choice_control/src/queries.rs

@@ -111,7 +111,7 @@ where
 
         Ok(WithStatus {
             value: chain_link.state(&store),
-            optimistic: chain_link.is_optimistic(),
+            status: chain_link.payload_status,
             finalized: store.is_slot_finalized(chain_link.slot()),
         })
     }
@@ -123,7 +123,7 @@ where
 
         WithStatus {
             value: chain_link.block_root,
-            optimistic: chain_link.is_optimistic(),
+            status: chain_link.payload_status,
             finalized: true,
         }
     }
@@ -135,7 +135,7 @@ where
 
         WithStatus {
             value: chain_link.block.clone_arc(),
-            optimistic: chain_link.is_optimistic(),
+            status: chain_link.payload_status,
             finalized: true,
         }
     }
@@ -153,7 +153,7 @@ where
 
         WithStatus {
             value: chain_link.state(&store),
-            optimistic: chain_link.is_optimistic(),
+            status: chain_link.payload_status,
             finalized: true,
         }
     }
@@ -226,7 +226,7 @@ where
 
         WithStatus {
             value: head.clone(),
-            optimistic: head.is_optimistic(),
+            status: head.payload_status,
             finalized: store.is_slot_finalized(head.slot()),
         }
     }
@@ -243,7 +243,7 @@ where
 
         WithStatus {
             value: head.block_root,
-            optimistic: head.is_optimistic(),
+            status: head.payload_status,
             finalized: store.is_slot_finalized(head.slot()),
         }
     }
@@ -255,7 +255,7 @@ where
 
         WithStatus {
             value: head.block.clone_arc(),
-            optimistic: head.is_optimistic(),
+            status: head.payload_status,
             finalized: store.is_slot_finalized(head.slot()),
         }
     }
@@ -267,7 +267,7 @@ where
 
         WithStatus {
             value: head.state(&store),
-            optimistic: head.is_optimistic(),
+            status: head.payload_status,
             finalized: store.is_slot_finalized(head.slot()),
         }
     }
@@ -343,7 +343,7 @@ where
         if let Some(chain_link) = store.chain_link(block_root) {
             return Ok(Some(WithStatus {
                 value: block_root,
-                optimistic: chain_link.is_optimistic(),
+                status: chain_link.payload_status,
                 finalized: store.is_slot_finalized(chain_link.slot()),
             }));
         }
@@ -388,7 +388,7 @@ where
 
                 return Ok(Some(WithStatus {
                     value: BlockWithRoot { block, root },
-                    optimistic: chain_link.is_optimistic(),
+                    status: chain_link.payload_status,
                     finalized: store.is_slot_finalized(chain_link.slot()),
                 }));
             }
@@ -541,7 +541,7 @@ where
 
         Ok(WithStatus {
             value: state,
-            optimistic: head.is_optimistic(),
+            status: head.payload_status,
             finalized: store.is_slot_finalized(head.slot()),
         })
     }
@@ -874,7 +874,7 @@ impl<P: Preset> Snapshot<'_, P> {
 
             return Ok(Some(WithStatus {
                 value: state,
-                optimistic: chain_link.is_optimistic(),
+                status: chain_link.payload_status,
                 finalized: store.is_slot_finalized(slot),
             }));
         }

fork_choice_store/src/store.rs

@@ -418,7 +418,7 @@ impl<P: Preset> Store<P> {
 
         Some(WithStatus {
             value: &chain_link.block,
-            optimistic: chain_link.is_optimistic(),
+            status: chain_link.payload_status,
             finalized: self.is_slot_finalized(chain_link.slot()),
         })
     }
@@ -471,7 +471,7 @@ impl<P: Preset> Store<P> {
             .find(|chain_link| chain_link.block.message().state_root() == state_root)
             .map(|chain_link| WithStatus {
                 value: chain_link.state(self),
-                optimistic: chain_link.is_optimistic(),
+                status: chain_link.payload_status,
                 finalized: self.is_slot_finalized(chain_link.slot()),
             })
     }