servers/bitwindow: return error from tick

servers/bitwindow/bdk/bdk.go

@@ -164,13 +164,6 @@ func (w *Wallet) execWallet(ctx context.Context, args ...string) ([]byte, error)
 		return nil, err
 	}
 
-	compacted := bytes.NewBuffer(nil)
-	// Sensitive stuff! Avoid logging the  response
-	if err := json.Compact(compacted, res); err != nil {
-		// Revert back to non-compacted
-		compacted = bytes.NewBuffer(res)
-	}
-
 	return res, nil
 }
 

servers/bitwindow/engines/bitcoind_engine.go

@@ -39,7 +39,6 @@ type Parser struct {
 //
 // Should be started in a goroutine.
 func (p *Parser) Run(ctx context.Context) error {
-	// Check every other second. We wouldn't wanna miss a nice rate, now would we
 	alertTicker := time.NewTicker(2 * time.Second)
 	defer alertTicker.Stop()
 
@@ -59,28 +58,28 @@ func (p *Parser) Run(ctx context.Context) error {
 				continue
 			}
 
+			// nolint:ineffassign
 			processing = true
-			p.handleTick(ctx)
+			if err := p.handleTick(ctx); err != nil {
+				zerolog.Ctx(ctx).Error().
+					Err(err).
+					Msgf("bitcoind_engine/parser: could not handle tick")
+				return err
+			}
 			processing = false
 		}
 	}
 }
 
-func (p *Parser) handleTick(ctx context.Context) {
+func (p *Parser) handleTick(ctx context.Context) error {
 	if err := p.detectChainDeletion(ctx); err != nil {
-		zerolog.Ctx(ctx).Error().
-			Err(err).
-			Msgf("bitcoind_engine/parser: could not detect chain deletion")
-		return
+		return fmt.Errorf("detect chain deletion: %w", err)
 	}
 
 	// Get latest processed height
 	lastProcessedHeight, lastProcessedHash, err := blocks.LatestProcessedHeight(ctx, p.db)
 	if err != nil {
-		zerolog.Ctx(ctx).Error().
-			Err(err).
-			Msgf("bitcoind_engine/parser: could not get latest processed height")
-		return
+		return fmt.Errorf("get latest processed height: %w", err)
 	}
 
 	// Get current blockchain height
@@ -89,7 +88,7 @@ func (p *Parser) handleTick(ctx context.Context) {
 		zerolog.Ctx(ctx).Error().
 			Err(err).
 			Msgf("bitcoind_engine/parser: could not get current height")
-		return
+		return nil
 	}
 
 	if lastProcessedHeight == currentHeight && lastProcessedHash != currentHash {
@@ -107,6 +106,8 @@ func (p *Parser) handleTick(ctx context.Context) {
 			continue
 		}
 	}
+
+	return nil
 }
 
 func (p *Parser) processBlock(ctx context.Context, height int32) error {

servers/bitwindow/go.mod

@@ -44,6 +44,5 @@ require (
 	golang.org/x/exp v0.0.0-20231226003508-02704c960a9b // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/text v0.17.0 // indirect
+	github.com/mattn/go-sqlite3 v1.14.24
 )
-
-require github.com/mattn/go-sqlite3 v1.14.24

servers/bitwindow/main.go

@@ -81,7 +81,7 @@ func realMain(ctx context.Context) error {
 	db, err := database.New(ctx)
 	if err != nil {
 		log.Error().Err(err).Msg("init database")
-		return err
+		return fmt.Errorf("init database: %w", err)
 	}
 	defer db.Close()
 
@@ -141,11 +141,13 @@ func realMain(ctx context.Context) error {
 	}
 
 	bitcoinEngine := bitcoind_engine.New(proxy, db)
-	go bitcoinEngine.Run(ctx)
 
 	log.Info().Msgf("server: listening on %s", conf.APIHost)
 
 	errs := make(chan error)
+	go func() {
+		errs <- bitcoinEngine.Run(ctx)
+	}()
 	go func() {
 		errs <- srv.Serve(ctx, conf.APIHost)
 	}()