From 81346896658aad7567a114b06bccdc9e1a389374 Mon Sep 17 00:00:00 2001
From: Nate Maninger <me@n8m.us>
Date: Tue, 24 Sep 2024 22:52:56 -0700
Subject: [PATCH] renterd: use private key directly

---
 nodes/manager.go | 3 ++-
 nodes/renterd.go | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nodes/manager.go b/nodes/manager.go
index f7767bf..ea090b4 100644
--- a/nodes/manager.go
+++ b/nodes/manager.go
@@ -121,13 +121,14 @@ func (m *Manager) addNodeAndWait(ctx context.Context, node Node, ready chan<- st
 // Close closes the manager and all running nodes and waits for them to exit.
 func (m *Manager) Close() error {
 	m.mu.Lock()
-	defer m.mu.Unlock()
 
 	select {
 	case <-m.close:
+		m.mu.Unlock()
 		return errors.New("manager already closed")
 	default:
 		close(m.close)
+		m.mu.Unlock()
 		m.wg.Wait()
 		return nil
 	}
diff --git a/nodes/renterd.go b/nodes/renterd.go
index b4993e1..be4bdec 100644
--- a/nodes/renterd.go
+++ b/nodes/renterd.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/blake2b-simd"
 	"go.sia.tech/core/gateway"
 	"go.sia.tech/core/types"
 	"go.sia.tech/coreutils"
@@ -212,9 +211,7 @@ func (m *Manager) StartRenterd(ctx context.Context, sk types.PrivateKey, ready c
 	}
 	defer wm.Close()
 
-	masterKey := blake2b.Sum256(append([]byte("worker"), sk...))
-
-	b, err := bus.New(ctx, masterKey, am, wh, cm, s, wm, store, 24*time.Hour, log.Named("bus"))
+	b, err := bus.New(ctx, ([32]byte)(sk[:32]), am, wh, cm, s, wm, store, 24*time.Hour, log.Named("bus"))
 	if err != nil {
 		return fmt.Errorf("failed to create bus: %w", err)
 	}
@@ -244,7 +241,7 @@ func (m *Manager) StartRenterd(ctx context.Context, sk types.PrivateKey, ready c
 		DownloadMaxMemory:        1 << 28, // 256 MiB
 		UploadMaxMemory:          1 << 28, // 256 MiB
 		UploadMaxOverdrive:       5,
-	}, masterKey, busClient, log.Named("worker"))
+	}, ([32]byte)(sk[:32]), busClient, log.Named("worker"))
 	if err != nil {
 		return fmt.Errorf("failed to create worker: %w", err)
 	}