From 3c93b9a3ce15d1385f583aba066f812bc1d1c48e Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Thu, 22 Feb 2024 15:43:13 -0800
Subject: [PATCH] Unnest some in checkPointRead

---
 ConflictSet.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 8fb2de2..9636073 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -808,21 +808,22 @@ bool checkPointRead(Node *n, const std::span<const uint8_t> key,
       assert(c >= 0);
       n = getChildExists(n, c);
       goto downLeftSpine;
-    } else {
-      int c = getChildGeq(n, remaining[0]);
-      if (c == remaining[0]) {
+    }
+
+    int c = getChildGeq(n, remaining[0]);
+    if (c != remaining[0]) {
+      if (c >= 0) {
         n = getChildExists(n, c);
-        remaining = remaining.subspan(1, remaining.size() - 1);
+        goto downLeftSpine;
       } else {
-        if (c >= 0) {
-          n = getChildExists(n, c);
-          goto downLeftSpine;
-        } else {
-          n = nextSibling(n);
-          goto downLeftSpine;
-        }
+        n = nextSibling(n);
+        goto downLeftSpine;
       }
     }
+
+    n = getChildExists(n, c);
+    remaining = remaining.subspan(1, remaining.size() - 1);
+
     if (n->partialKeyLen > 0) {
       int commonLen = std::min<int>(n->partialKeyLen, remaining.size());
       int i = longestCommonPrefix(n->partialKey, remaining.data(), commonLen);