merge fix

Signed-off-by: Kristoffer Dalby <[email protected]>
kradalby · Jan 12, 2024 · 1fe8d22 · 1fe8d22
1 parent 733e48f
commit 1fe8d22
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/hscontrol/db/node.go b/hscontrol/db/node.go
@@ -169,7 +169,7 @@ func (hsdb *HSDatabase) GetNodeByAnyKey(
 	nodeKey key.NodePublic,
 	oldNodeKey key.NodePublic,
 ) (*types.Node, error) {
-	return Read(hsdb.db, func(rx *gorm.DB) (*types.Node, error) {
+	return Read(hsdb.DB, func(rx *gorm.DB) (*types.Node, error) {
 		return GetNodeByAnyKey(rx, machineKey, nodeKey, oldNodeKey)
 	})
 }
@@ -547,7 +547,10 @@ func IsRoutesEnabled(tx *gorm.DB, node *types.Node, routeStr string) bool {
 	return false
 }
 
-func (hsdb *HSDatabase) enableRoutes(node *types.Node, routeStrs ...string) (*types.StateUpdate, error) {
+func (hsdb *HSDatabase) enableRoutes(
+	node *types.Node,
+	routeStrs ...string,
+) (*types.StateUpdate, error) {
 	return Write(hsdb.DB, func(tx *gorm.DB) (*types.StateUpdate, error) {
 		return enableRoutes(tx, node, routeStrs...)
 	})