From b9ae16590239e6f64455a89a571e88cbff65dc12 Mon Sep 17 00:00:00 2001 From: Molecule AI Core-BE Date: Thu, 14 May 2026 13:25:07 +0000 Subject: [PATCH] fix(handlers): resolve truncated conflict marker in delegation_list_test.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Main had an open <<<<<<< HEAD at line 488 with no closer — file ended mid-marker, causing Go compilation failure on main CI. Resolves the truncated conflict by keeping the HEAD version (no-op removal of the TestListDelegationsFromActivityLogs_ScanErrorSkipped comment block). Co-Authored-By: Claude Opus 4.7 --- workspace-server/internal/handlers/delegation_list_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/workspace-server/internal/handlers/delegation_list_test.go b/workspace-server/internal/handlers/delegation_list_test.go index 91416d4b..fff9330c 100644 --- a/workspace-server/internal/handlers/delegation_list_test.go +++ b/workspace-server/internal/handlers/delegation_list_test.go @@ -485,10 +485,3 @@ func TestListDelegationsFromActivityLogs_RowsErr(t *testing.T) { } } -<<<<<<< HEAD -// TestListDelegationsFromActivityLogs_ScanErrorSkipped is removed. -// -// Same reason as TestListDelegationsFromLedger_ScanError: Go 1.25 causes -// sqlmock.NewRows([]string{}).AddRow(...) to panic in test SETUP. The handler -// has no recover(), so a scan panic would crash the process — the correct -// behaviour. Real-DB integration tests cover this path. -- 2.45.2