Resolve auto-merge failures

ledger/src/blockstore.rs

@@ -5316,7 +5316,7 @@ pub mod tests {
         assert!(s1.next_slots.is_empty());
         // Slot 1 is not trunk because slot 0 hasn't been inserted yet
 <<<<<<< HEAD
-        assert!(!s1.is_connected);
+        assert!(!s1.is_connected());
         assert_eq!(s1.parent_slot, Some(0));
         assert_eq!(s1.last_index, Some(shreds_per_slot as u64 - 1));
 =======
@@ -5334,15 +5334,15 @@ pub mod tests {
         assert!(s2.next_slots.is_empty());
         // Slot 2 is not trunk because slot 0 hasn't been inserted yet
 <<<<<<< HEAD
-        assert!(!s2.is_connected);
+        assert!(!s2.is_connected());
         assert_eq!(s2.parent_slot, Some(1));
         assert_eq!(s2.last_index, Some(shreds_per_slot as u64 - 1));
 
         // Check the first slot again, it should chain to the second slot,
         // but still isn't part of the trunk
         let s1 = blockstore.meta(1).unwrap().unwrap();
         assert_eq!(s1.next_slots, vec![2]);
-        assert!(!s1.is_connected);
+        assert!(!s1.is_connected());
         assert_eq!(s1.parent_slot, Some(0));
         assert_eq!(s1.last_index, Some(shreds_per_slot as u64 - 1));
 =======
@@ -5375,7 +5375,7 @@ pub mod tests {
             }
 <<<<<<< HEAD
             assert_eq!(s.last_index, Some(shreds_per_slot as u64 - 1));
-            assert!(s.is_connected);
+            assert!(s.is_connected());
 =======
             assert_eq!(meta.last_index, Some(shreds_per_slot as u64 - 1));
             assert!(meta.is_connected());
@@ -5439,9 +5439,9 @@ pub mod tests {
 
 <<<<<<< HEAD
             if i == 0 {
-                assert!(s.is_connected);
+                assert!(s.is_connected());
             } else {
-                assert!(!s.is_connected);
+                assert!(!s.is_connected());
 =======
             if slot == 0 {
                 assert!(meta.is_connected());
@@ -5473,7 +5473,7 @@ pub mod tests {
             }
 <<<<<<< HEAD
             assert_eq!(s.last_index, Some(shreds_per_slot as u64 - 1));
-            assert!(s.is_connected);
+            assert!(s.is_connected());
 =======
             assert_eq!(meta.last_index, Some(shreds_per_slot as u64 - 1));
             assert!(meta.is_connected());
@@ -5540,9 +5540,9 @@ pub mod tests {
 
             // Other than slot 0, no slots should be part of the trunk
             if i != 0 {
-                assert!(!s.is_connected);
+                assert!(!s.is_connected());
             } else {
-                assert!(s.is_connected);
+                assert!(s.is_connected());
             }
         }
 
@@ -5562,9 +5562,9 @@ pub mod tests {
                     }
 <<<<<<< HEAD
                     if i <= slot_index as u64 + 3 {
-                        assert!(s.is_connected);
+                        assert!(s.is_connected());
                     } else {
-                        assert!(!s.is_connected);
+                        assert!(!s.is_connected());
 =======
                     if slot <= slot_index + 3 {
                         assert!(meta.is_connected());