review feedback

Author: buffalojoec

program/tests/functional.rs

@@ -1,4 +1,4 @@
-// #![cfg(feature = "test-sbf")]
+#![cfg(feature = "test-sbf")]
 
 use {
     bincode::serialized_size,
@@ -44,10 +44,9 @@ fn setup() -> Mollusk {
 fn get_config_space(key_len: usize) -> usize {
     let entry_size = bincode::serialized_size(&(Pubkey::default(), true)).unwrap() as usize;
     let total_keys_size = (key_len).checked_mul(entry_size).unwrap();
-    bincode::serialized_size(&(ConfigKeys::default(), MyConfig::default()))
-        .ok()
-        .and_then(|s| s.checked_add(total_keys_size as u64))
-        .unwrap() as usize
+    let serialized_size =
+        bincode::serialized_size(&(ConfigKeys::default(), MyConfig::default())).unwrap() as usize;
+    serialized_size.checked_add(total_keys_size).unwrap()
 }
 
 fn create_config_account(mollusk: &Mollusk, keys: Vec<(Pubkey, bool)>) -> AccountSharedData {