From 3ac3b6a90df2c0b0cde6c151a0f8381716aae0db Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Fri, 30 Sep 2022 10:47:10 +0200
Subject: [PATCH] watchtower: refactor getClientSession helper funcs

Small refactor to some of the tower client db helper functions in order
to simplify upcoming commits.
---
 watchtower/wtdb/client_db.go | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/watchtower/wtdb/client_db.go b/watchtower/wtdb/client_db.go
index 3cb5a8c70..f862b186c 100644
--- a/watchtower/wtdb/client_db.go
+++ b/watchtower/wtdb/client_db.go
@@ -1174,14 +1174,17 @@ func getClientSession(sessions, towers kvdb.RBucket,
 		return nil, err
 	}
 
+	// Can't fail because client session body has already been read.
+	sessionBkt := sessions.NestedReadBucket(idBytes)
+
 	// Fetch the committed updates for this session.
-	commitedUpdates, err := getClientSessionCommits(sessions, idBytes)
+	commitedUpdates, err := getClientSessionCommits(sessionBkt)
 	if err != nil {
 		return nil, err
 	}
 
 	// Fetch the acked updates for this session.
-	ackedUpdates, err := getClientSessionAcks(sessions, idBytes)
+	ackedUpdates, err := getClientSessionAcks(sessionBkt)
 	if err != nil {
 		return nil, err
 	}
@@ -1195,11 +1198,8 @@ func getClientSession(sessions, towers kvdb.RBucket,
 
 // getClientSessionCommits retrieves all committed updates for the session
 // identified by the serialized session id.
-func getClientSessionCommits(sessions kvdb.RBucket,
-	idBytes []byte) ([]CommittedUpdate, error) {
-
-	// Can't fail because client session body has already been read.
-	sessionBkt := sessions.NestedReadBucket(idBytes)
+func getClientSessionCommits(sessionBkt kvdb.RBucket) ([]CommittedUpdate,
+	error) {
 
 	// Initialize commitedUpdates so that we can return an initialized map
 	// if no committed updates exist.
@@ -1231,11 +1231,8 @@ func getClientSessionCommits(sessions kvdb.RBucket,
 
 // getClientSessionAcks retrieves all acked updates for the session identified
 // by the serialized session id.
-func getClientSessionAcks(sessions kvdb.RBucket,
-	idBytes []byte) (map[uint16]BackupID, error) {
-
-	// Can't fail because client session body has already been read.
-	sessionBkt := sessions.NestedReadBucket(idBytes)
+func getClientSessionAcks(sessionBkt kvdb.RBucket) (map[uint16]BackupID,
+	error) {
 
 	// Initialize ackedUpdates so that we can return an initialized map if
 	// no acked updates exist.