From 0ca20d53eab6e2188a89240a8f36b2940fa88ae3 Mon Sep 17 00:00:00 2001 From: Virgil Date: Mon, 30 Mar 2026 20:35:50 +0000 Subject: [PATCH] test(node): migrate tests to AX-native constructors Co-Authored-By: Virgil --- node/bench_test.go | 12 +++--- node/controller_test.go | 20 ++++----- node/identity_test.go | 16 +++---- node/integration_test.go | 12 +++--- node/peer_test.go | 18 ++++---- node/transport_test.go | 4 +- node/worker_test.go | 92 ++++++++++++++++++++-------------------- 7 files changed, 87 insertions(+), 87 deletions(-) diff --git a/node/bench_test.go b/node/bench_test.go index 072404f..91ef804 100644 --- a/node/bench_test.go +++ b/node/bench_test.go @@ -15,7 +15,7 @@ func BenchmarkIdentityGenerate(b *testing.B) { b.ReportAllocs() for b.Loop() { dir := b.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { b.Fatalf("create node manager: %v", err) } @@ -30,10 +30,10 @@ func BenchmarkDeriveSharedSecret(b *testing.B) { dir1 := b.TempDir() dir2 := b.TempDir() - nm1, _ := NewNodeManagerWithPaths(testJoinPath(dir1, "k"), testJoinPath(dir1, "n")) + nm1, _ := NewNodeManagerFromPaths(testJoinPath(dir1, "k"), testJoinPath(dir1, "n")) nm1.GenerateIdentity("node1", RoleDual) - nm2, _ := NewNodeManagerWithPaths(testJoinPath(dir2, "k"), testJoinPath(dir2, "n")) + nm2, _ := NewNodeManagerFromPaths(testJoinPath(dir2, "k"), testJoinPath(dir2, "n")) nm2.GenerateIdentity("node2", RoleDual) peerPubKey := nm2.GetIdentity().PublicKey @@ -145,10 +145,10 @@ func BenchmarkSMSGEncryptDecrypt(b *testing.B) { dir1 := b.TempDir() dir2 := b.TempDir() - nm1, _ := NewNodeManagerWithPaths(testJoinPath(dir1, "k"), testJoinPath(dir1, "n")) + nm1, _ := NewNodeManagerFromPaths(testJoinPath(dir1, "k"), testJoinPath(dir1, "n")) nm1.GenerateIdentity("node1", RoleDual) - nm2, _ := NewNodeManagerWithPaths(testJoinPath(dir2, "k"), testJoinPath(dir2, "n")) + nm2, _ := NewNodeManagerFromPaths(testJoinPath(dir2, "k"), testJoinPath(dir2, "n")) nm2.GenerateIdentity("node2", RoleDual) sharedSecret, _ := nm1.DeriveSharedSecret(nm2.GetIdentity().PublicKey) @@ -197,7 +197,7 @@ func BenchmarkChallengeSignVerify(b *testing.B) { // BenchmarkPeerScoring measures KD-tree rebuild and peer selection. func BenchmarkPeerScoring(b *testing.B) { dir := b.TempDir() - reg, err := NewPeerRegistryWithPath(testJoinPath(dir, "peers.json")) + reg, err := NewPeerRegistryFromPath(testJoinPath(dir, "peers.json")) if err != nil { b.Fatalf("create registry: %v", err) } diff --git a/node/controller_test.go b/node/controller_test.go index 937bff4..4b3ba3e 100644 --- a/node/controller_test.go +++ b/node/controller_test.go @@ -24,7 +24,7 @@ func setupControllerPair(t *testing.T) (*Controller, *Worker, *testTransportPair // Server side: register a Worker to handle incoming requests. worker := NewWorker(tp.ServerNode, tp.Server) - worker.RegisterWithTransport() + worker.RegisterOnTransport() // Client side: create a Controller (registers handleResponse via OnMessage). controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) @@ -56,7 +56,7 @@ func makeWorkerServer(t *testing.T) (*NodeManager, string, *Transport) { u, _ := url.Parse(ts.URL) worker := NewWorker(nm, srv) - worker.RegisterWithTransport() + worker.RegisterOnTransport() t.Cleanup(func() { // Brief pause to let in-flight readLoop/Send operations finish before @@ -120,7 +120,7 @@ func TestController_AutoConnect_Good(t *testing.T) { // Register worker on the server side. worker := NewWorker(tp.ServerNode, tp.Server) - worker.RegisterWithTransport() + worker.RegisterOnTransport() // Create controller WITHOUT establishing a connection first. controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) @@ -432,7 +432,7 @@ func setupControllerPairWithMiner(t *testing.T) (*Controller, *Worker, *testTran }, } worker.SetMinerManager(mm) - worker.RegisterWithTransport() + worker.RegisterOnTransport() // Client side: create a Controller. controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) @@ -551,7 +551,7 @@ func TestController_StartRemoteMiner_NoIdentity_Bad(t *testing.T) { // Create a node without identity keyPath, configPath := testNodeManagerPaths(t.TempDir()) - nmNoID, err := NewNodeManagerWithPaths(keyPath, configPath) + nmNoID, err := NewNodeManagerFromPaths(keyPath, configPath) require.NoError(t, err) controller := NewController(nmNoID, tp.ClientReg, tp.Client) @@ -580,7 +580,7 @@ func TestController_StopRemoteMiner_NotFound_Bad(t *testing.T) { func TestController_StopRemoteMiner_NoIdentity_Bad(t *testing.T) { tp := setupTestTransportPair(t) keyPath, configPath := testNodeManagerPaths(t.TempDir()) - nmNoID, err := NewNodeManagerWithPaths(keyPath, configPath) + nmNoID, err := NewNodeManagerFromPaths(keyPath, configPath) require.NoError(t, err) controller := NewController(nmNoID, tp.ClientReg, tp.Client) @@ -613,7 +613,7 @@ func TestController_GetRemoteLogs_LimitedLines_Good(t *testing.T) { func TestController_GetRemoteLogs_NoIdentity_Bad(t *testing.T) { tp := setupTestTransportPair(t) keyPath, configPath := testNodeManagerPaths(t.TempDir()) - nmNoID, err := NewNodeManagerWithPaths(keyPath, configPath) + nmNoID, err := NewNodeManagerFromPaths(keyPath, configPath) require.NoError(t, err) controller := NewController(nmNoID, tp.ClientReg, tp.Client) @@ -640,7 +640,7 @@ func TestController_GetRemoteStats_WithMiners_Good(t *testing.T) { func TestController_GetRemoteStats_NoIdentity_Bad(t *testing.T) { tp := setupTestTransportPair(t) keyPath, configPath := testNodeManagerPaths(t.TempDir()) - nmNoID, err := NewNodeManagerWithPaths(keyPath, configPath) + nmNoID, err := NewNodeManagerFromPaths(keyPath, configPath) require.NoError(t, err) controller := NewController(nmNoID, tp.ClientReg, tp.Client) @@ -654,7 +654,7 @@ func TestController_ConnectToPeer_Success_Good(t *testing.T) { tp := setupTestTransportPair(t) worker := NewWorker(tp.ServerNode, tp.Server) - worker.RegisterWithTransport() + worker.RegisterOnTransport() controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) @@ -716,7 +716,7 @@ func TestController_HandleResponse_FullChannel_Ugly(t *testing.T) { func TestController_PingPeer_NoIdentity_Bad(t *testing.T) { tp := setupTestTransportPair(t) keyPath, configPath := testNodeManagerPaths(t.TempDir()) - nmNoID, _ := NewNodeManagerWithPaths(keyPath, configPath) + nmNoID, _ := NewNodeManagerFromPaths(keyPath, configPath) controller := NewController(nmNoID, tp.ClientReg, tp.Client) _, err := controller.PingPeer("some-peer") diff --git a/node/identity_test.go b/node/identity_test.go index 9693716..3a2ff9c 100644 --- a/node/identity_test.go +++ b/node/identity_test.go @@ -7,7 +7,7 @@ import ( // setupTestNodeManager creates a NodeManager with paths in a temp directory. func setupTestNodeManager(t *testing.T) (*NodeManager, func()) { tmpDir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(tmpDir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(tmpDir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -65,7 +65,7 @@ func TestIdentity_NodeIdentity_Good(t *testing.T) { keyPath, configPath := testNodeManagerPaths(tmpDir) // First, create an identity - nm1, err := NewNodeManagerWithPaths(keyPath, configPath) + nm1, err := NewNodeManagerFromPaths(keyPath, configPath) if err != nil { t.Fatalf("failed to create first node manager: %v", err) } @@ -79,7 +79,7 @@ func TestIdentity_NodeIdentity_Good(t *testing.T) { originalPubKey := nm1.GetIdentity().PublicKey // Create a new manager - should load existing identity - nm2, err := NewNodeManagerWithPaths(keyPath, configPath) + nm2, err := NewNodeManagerFromPaths(keyPath, configPath) if err != nil { t.Fatalf("failed to create second node manager: %v", err) } @@ -104,7 +104,7 @@ func TestIdentity_NodeIdentity_Good(t *testing.T) { tmpDir2 := t.TempDir() // Node 1 - nm1, err := NewNodeManagerWithPaths(testNodeManagerPaths(tmpDir1)) + nm1, err := NewNodeManagerFromPaths(testNodeManagerPaths(tmpDir1)) if err != nil { t.Fatalf("failed to create node manager 1: %v", err) } @@ -114,7 +114,7 @@ func TestIdentity_NodeIdentity_Good(t *testing.T) { } // Node 2 - nm2, err := NewNodeManagerWithPaths(testNodeManagerPaths(tmpDir2)) + nm2, err := NewNodeManagerFromPaths(testNodeManagerPaths(tmpDir2)) if err != nil { t.Fatalf("failed to create node manager 2: %v", err) } @@ -306,10 +306,10 @@ func TestIdentity_ChallengeResponse_Good(t *testing.T) { tmpDir1 := t.TempDir() tmpDir2 := t.TempDir() - nm1, _ := NewNodeManagerWithPaths(testNodeManagerPaths(tmpDir1)) + nm1, _ := NewNodeManagerFromPaths(testNodeManagerPaths(tmpDir1)) nm1.GenerateIdentity("challenger", RoleDual) - nm2, _ := NewNodeManagerWithPaths(testNodeManagerPaths(tmpDir2)) + nm2, _ := NewNodeManagerFromPaths(testNodeManagerPaths(tmpDir2)) nm2.GenerateIdentity("responder", RoleDual) // Challenger generates challenge @@ -355,7 +355,7 @@ func TestIdentity_NodeManager_GetIdentity_NilWhenNoIdentity_Bad(t *testing.T) { func TestIdentity_NodeManager_Delete_NoFiles_Bad(t *testing.T) { tmpDir := t.TempDir() - nm, err := NewNodeManagerWithPaths( + nm, err := NewNodeManagerFromPaths( testJoinPath(tmpDir, "nonexistent.key"), testJoinPath(tmpDir, "nonexistent.json"), ) diff --git a/node/integration_test.go b/node/integration_test.go index c31da5a..14f68b4 100644 --- a/node/integration_test.go +++ b/node/integration_test.go @@ -78,7 +78,7 @@ func TestIntegration_FullNodeLifecycle_Good(t *testing.T) { }, }, }) - worker.RegisterWithTransport() + worker.RegisterOnTransport() // Start the worker transport behind httptest. mux := http.NewServeMux() @@ -346,7 +346,7 @@ func TestIntegration_IdentityPersistenceAndReload_Good(t *testing.T) { keyPath, configPath := testNodeManagerPaths(dir) // Create and persist identity. - nm1, err := NewNodeManagerWithPaths(keyPath, configPath) + nm1, err := NewNodeManagerFromPaths(keyPath, configPath) require.NoError(t, err) require.NoError(t, nm1.GenerateIdentity("persistent-node", RoleDual)) @@ -354,7 +354,7 @@ func TestIntegration_IdentityPersistenceAndReload_Good(t *testing.T) { require.NotNil(t, original) // Reload from disk. - nm2, err := NewNodeManagerWithPaths(keyPath, configPath) + nm2, err := NewNodeManagerFromPaths(keyPath, configPath) require.NoError(t, err) require.True(t, nm2.HasIdentity(), "identity should be loaded from disk") @@ -383,7 +383,7 @@ func TestIntegration_IdentityPersistenceAndReload_Good(t *testing.T) { // stmfGenerateKeyPair is a helper that generates a keypair and returns // the public key as base64 (for use in DeriveSharedSecret tests). func stmfGenerateKeyPair(dir string) (string, error) { - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { return "", err } @@ -526,7 +526,7 @@ func TestIntegration_AllowlistHandshakeAccepted_Good(t *testing.T) { workerTransport := NewTransport(workerNM, workerReg, DefaultTransportConfig()) worker := NewWorker(workerNM, workerTransport) - worker.RegisterWithTransport() + worker.RegisterOnTransport() mux := http.NewServeMux() mux.HandleFunc("/ws", workerTransport.handleWSUpgrade) @@ -657,7 +657,7 @@ func TestIntegration_GetRemoteStats_EndToEnd_Good(t *testing.T) { tp := setupTestTransportPair(t) worker := NewWorker(tp.ServerNode, tp.Server) - worker.RegisterWithTransport() + worker.RegisterOnTransport() controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) diff --git a/node/peer_test.go b/node/peer_test.go index 9b0d506..a8ce4d5 100644 --- a/node/peer_test.go +++ b/node/peer_test.go @@ -10,7 +10,7 @@ func setupTestPeerRegistry(t *testing.T) (*PeerRegistry, func()) { tmpDir := t.TempDir() peersPath := testJoinPath(tmpDir, "peers.json") - pr, err := NewPeerRegistryWithPath(peersPath) + pr, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -352,7 +352,7 @@ func TestPeer_Registry_Persistence_Good(t *testing.T) { peersPath := testJoinPath(tmpDir, "peers.json") // Create and save - pr1, err := NewPeerRegistryWithPath(peersPath) + pr1, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create first registry: %v", err) } @@ -373,7 +373,7 @@ func TestPeer_Registry_Persistence_Good(t *testing.T) { } // Load in new registry from same path - pr2, err := NewPeerRegistryWithPath(peersPath) + pr2, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create second registry: %v", err) } @@ -822,7 +822,7 @@ func TestPeer_Registry_Close_NoDirtyData_Ugly(t *testing.T) { func TestPeer_Registry_Close_WithDirtyData_Ugly(t *testing.T) { tmpDir := t.TempDir() peersPath := testJoinPath(tmpDir, "peers.json") - pr, err := NewPeerRegistryWithPath(peersPath) + pr, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create registry: %v", err) } @@ -837,7 +837,7 @@ func TestPeer_Registry_Close_WithDirtyData_Ugly(t *testing.T) { } // Verify data was saved - pr2, err := NewPeerRegistryWithPath(peersPath) + pr2, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to reload: %v", err) } @@ -849,7 +849,7 @@ func TestPeer_Registry_Close_WithDirtyData_Ugly(t *testing.T) { func TestPeer_Registry_ScheduleSave_Debounce_Ugly(t *testing.T) { tmpDir := t.TempDir() peersPath := testJoinPath(tmpDir, "peers.json") - pr, err := NewPeerRegistryWithPath(peersPath) + pr, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create registry: %v", err) } @@ -869,7 +869,7 @@ func TestPeer_Registry_ScheduleSave_Debounce_Ugly(t *testing.T) { func TestPeer_Registry_SaveNow_Good(t *testing.T) { tmpDir := t.TempDir() peersPath := testJoinPath(tmpDir, "subdir", "peers.json") - pr, err := NewPeerRegistryWithPath(peersPath) + pr, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create registry: %v", err) } @@ -897,7 +897,7 @@ func TestPeer_Registry_ScheduleSave_TimerFires_Ugly(t *testing.T) { tmpDir := t.TempDir() peersPath := testJoinPath(tmpDir, "peers.json") - pr, err := NewPeerRegistryWithPath(peersPath) + pr, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to create registry: %v", err) } @@ -913,7 +913,7 @@ func TestPeer_Registry_ScheduleSave_TimerFires_Ugly(t *testing.T) { } // Reload and verify - pr2, err := NewPeerRegistryWithPath(peersPath) + pr2, err := NewPeerRegistryFromPath(peersPath) if err != nil { t.Fatalf("failed to reload: %v", err) } diff --git a/node/transport_test.go b/node/transport_test.go index 21368b7..d278ac1 100644 --- a/node/transport_test.go +++ b/node/transport_test.go @@ -19,7 +19,7 @@ import ( func testNode(t *testing.T, name string, role NodeRole) *NodeManager { t.Helper() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("create node manager %q: %v", name, err) } @@ -33,7 +33,7 @@ func testNode(t *testing.T, name string, role NodeRole) *NodeManager { func testRegistry(t *testing.T) *PeerRegistry { t.Helper() dir := t.TempDir() - reg, err := NewPeerRegistryWithPath(testJoinPath(dir, "peers.json")) + reg, err := NewPeerRegistryFromPath(testJoinPath(dir, "peers.json")) if err != nil { t.Fatalf("create registry: %v", err) } diff --git a/node/worker_test.go b/node/worker_test.go index 7244abc..ccea789 100644 --- a/node/worker_test.go +++ b/node/worker_test.go @@ -21,7 +21,7 @@ func TestWorker_NewWorker_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -29,7 +29,7 @@ func TestWorker_NewWorker_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -54,7 +54,7 @@ func TestWorker_SetMinerManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -62,7 +62,7 @@ func TestWorker_SetMinerManager_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -84,7 +84,7 @@ func TestWorker_SetProfileManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -92,7 +92,7 @@ func TestWorker_SetProfileManager_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -114,7 +114,7 @@ func TestWorker_HandlePing_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -122,7 +122,7 @@ func TestWorker_HandlePing_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -175,7 +175,7 @@ func TestWorker_HandleGetStats_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -183,7 +183,7 @@ func TestWorker_HandleGetStats_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -235,7 +235,7 @@ func TestWorker_HandleStartMiner_NoManager_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -243,7 +243,7 @@ func TestWorker_HandleStartMiner_NoManager_Bad(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -275,7 +275,7 @@ func TestWorker_HandleStopMiner_NoManager_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -283,7 +283,7 @@ func TestWorker_HandleStopMiner_NoManager_Bad(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -315,7 +315,7 @@ func TestWorker_HandleGetLogs_NoManager_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -323,7 +323,7 @@ func TestWorker_HandleGetLogs_NoManager_Bad(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -355,7 +355,7 @@ func TestWorker_HandleDeploy_Profile_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -363,7 +363,7 @@ func TestWorker_HandleDeploy_Profile_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -399,7 +399,7 @@ func TestWorker_HandleDeploy_UnknownType_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -407,7 +407,7 @@ func TestWorker_HandleDeploy_UnknownType_Bad(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -582,7 +582,7 @@ func TestWorker_HandleStartMiner_WithManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } @@ -590,7 +590,7 @@ func TestWorker_HandleStartMiner_WithManager_Good(t *testing.T) { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -751,14 +751,14 @@ func TestWorker_HandleStopMiner_WithManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -815,14 +815,14 @@ func TestWorker_HandleGetLogs_WithManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -922,14 +922,14 @@ func TestWorker_HandleGetStats_WithMinerManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -983,14 +983,14 @@ func TestWorker_HandleMessage_UnknownType_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -1010,14 +1010,14 @@ func TestWorker_HandleDeploy_ProfileWithManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -1065,14 +1065,14 @@ func TestWorker_HandleDeploy_ProfileSaveFails_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -1111,14 +1111,14 @@ func TestWorker_HandleDeploy_MinerBundle_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -1175,14 +1175,14 @@ func TestWorker_HandleDeploy_FullBundle_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -1231,14 +1231,14 @@ func TestWorker_HandleDeploy_MinerBundle_WithProfileManager_Good(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, err := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, err := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) if err != nil { t.Fatalf("failed to create node manager: %v", err) } if err := nm.GenerateIdentity("test-worker", RoleWorker); err != nil { t.Fatalf("failed to generate identity: %v", err) } - pr, err := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, err := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) if err != nil { t.Fatalf("failed to create peer registry: %v", err) } @@ -1292,9 +1292,9 @@ func TestWorker_HandleDeploy_InvalidPayload_Bad(t *testing.T) { defer cleanup() dir := t.TempDir() - nm, _ := NewNodeManagerWithPaths(testNodeManagerPaths(dir)) + nm, _ := NewNodeManagerFromPaths(testNodeManagerPaths(dir)) nm.GenerateIdentity("test", RoleWorker) - pr, _ := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, _ := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) transport := NewTransport(nm, pr, DefaultTransportConfig()) worker := NewWorker(nm, transport) worker.DataDir = t.TempDir() @@ -1314,12 +1314,12 @@ func TestWorker_HandleGetStats_NoIdentity_Bad(t *testing.T) { defer cleanup() tmpDir := t.TempDir() - nm, _ := NewNodeManagerWithPaths( + nm, _ := NewNodeManagerFromPaths( testJoinPath(tmpDir, "priv.key"), testJoinPath(tmpDir, "node.json"), ) // Don't generate identity - pr, _ := NewPeerRegistryWithPath(testJoinPath(t.TempDir(), "peers.json")) + pr, _ := NewPeerRegistryFromPath(testJoinPath(t.TempDir(), "peers.json")) transport := NewTransport(nm, pr, DefaultTransportConfig()) worker := NewWorker(nm, transport) worker.DataDir = t.TempDir() @@ -1337,7 +1337,7 @@ func TestWorker_HandleMessage_IntegrationViaWebSocket_Good(t *testing.T) { worker := NewWorker(tp.ServerNode, tp.Server) // No miner manager set -- start_miner will fail and send error response - worker.RegisterWithTransport() + worker.RegisterOnTransport() controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) tp.connectClient(t) @@ -1376,7 +1376,7 @@ func TestWorker_HandleMessage_GetStats_IntegrationViaWebSocket_Good(t *testing.T }, } worker.SetMinerManager(mm) - worker.RegisterWithTransport() + worker.RegisterOnTransport() controller := NewController(tp.ClientNode, tp.ClientReg, tp.Client) tp.connectClient(t)