From 496112e0e02b509876e84af34e34f9c8ecaa96de Mon Sep 17 00:00:00 2001
From: Jay <wisehodl@pm.me>
Date: Thu, 5 Mar 2026 16:54:53 -0500
Subject: [PATCH] Fix deadlock by buffering return values. Remove standalone
 error return value.

---
 write.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/write.go b/write.go
index eed3aea..6022001 100644
--- a/write.go
+++ b/write.go
@@ -46,7 +46,7 @@ func WriteEvents(
 	events [][]byte,
 	driver neo4j.Driver, boltdb *bolt.DB,
 	opts *WriteOptions,
-) (WriteReport, error) {
+) WriteReport {
 	start := time.Now()
 
 	if opts == nil {
@@ -57,7 +57,7 @@ func WriteEvents(
 
 	err := SetupBoltDB(boltdb)
 	if err != nil {
-		return WriteReport{}, fmt.Errorf("error setting up bolt db: %w", err)
+		return WriteReport{Error: fmt.Errorf("error setting up bolt db: %w", err)}
 	}
 
 	var wg sync.WaitGroup
@@ -77,7 +77,7 @@ func WriteEvents(
 	go parseEventJSON(&wg, eventChan, parsedChan, parseExcludedChan)
 
 	// Collect Rejected Events
-	collectedParseExcludedChan := make(chan []EventTraveller)
+	collectedParseExcludedChan := make(chan []EventTraveller, 1)
 
 	wg.Add(1)
 	go collectTravellers(&wg, parseExcludedChan, collectedParseExcludedChan)
@@ -91,7 +91,7 @@ func WriteEvents(
 		parsedChan, queuedChan, policyExcludedChan)
 
 	// Collect Skipped Events
-	collectedPolicyExcludedChan := make(chan []EventTraveller)
+	collectedPolicyExcludedChan := make(chan []EventTraveller, 1)
 
 	wg.Add(1)
 	go collectTravellers(&wg, policyExcludedChan, collectedPolicyExcludedChan)
@@ -103,7 +103,7 @@ func WriteEvents(
 	go convertEventsToSubgraphs(&wg, opts.Expanders, queuedChan, convertedChan)
 
 	// Write Events To Databases
-	writeResultChan := make(chan WriteResult)
+	writeResultChan := make(chan WriteResult, 1)
 
 	wg.Add(1)
 	go writeEventsToDatabases(&wg, driver, boltdb, convertedChan, writeResultChan)
@@ -132,7 +132,7 @@ func WriteEvents(
 		Neo4jResultSummaries: writeResult.ResultSummaries,
 		Duration:             time.Since(start),
 		Error:                writeResult.Error,
-	}, writeResult.Error
+	}
 }
 
 func setDefaultWriteOptions(opts *WriteOptions) {
@@ -254,8 +254,8 @@ func writeEventsToDatabases(
 	boltEventChan := make(chan EventTraveller)
 	graphEventChan := make(chan EventTraveller)
 
-	boltErrorChan := make(chan error)
-	graphResultChan := make(chan WriteResult)
+	boltErrorChan := make(chan error, 1)
+	graphResultChan := make(chan WriteResult, 1)
 
 	localWg.Add(2)
 	go writeEventsToBoltDB(&localWg, boltdb, boltEventChan, boltErrorChan)