chore(itest): run babylond in e2e

Makefile

@@ -1,6 +1,5 @@
 DOCKER = $(shell which docker)
 BUILDDIR ?= $(CURDIR)/build
-TOOLS_DIR := tools
 
 BABYLON_PKG := github.com/babylonlabs-io/babylon/cmd/babylond
 
@@ -51,8 +50,7 @@ test:
 	go test ./...
 
 test-e2e:
-	cd $(TOOLS_DIR); go install -trimpath $(BABYLON_PKG);
-	go test -mod=readonly -timeout=25m -v $(PACKAGES_E2E) -count=1 --tags=e2e
+	go test -mod=readonly -timeout=25m -failfast -v $(PACKAGES_E2E) -count=1 --tags=e2e
 
 proto-gen:
 	@$(call print, "Compiling protos.")

cmd/stakerd/main.go

@@ -1,27 +1,26 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"os"
+	"os/signal"
 	"runtime/pprof"
+	"syscall"
 
 	"github.com/babylonlabs-io/btc-staker/metrics"
 	staker "github.com/babylonlabs-io/btc-staker/staker"
 	scfg "github.com/babylonlabs-io/btc-staker/stakercfg"
 	service "github.com/babylonlabs-io/btc-staker/stakerservice"
 
 	"github.com/jessevdk/go-flags"
-	"github.com/lightningnetwork/lnd/signal"
 )
 
 func main() {
 	// Hook interceptor for os signals.
-	shutdownInterceptor, err := signal.Intercept()
-	if err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
+	defer cancel()
 
 	cfg, cfgLogger, zapLogger, err := scfg.LoadConfig()
 
@@ -89,15 +88,13 @@ func main() {
 		cfg,
 		staker,
 		cfgLogger,
-		shutdownInterceptor,
 		dbBackend,
 	)
 
 	addr := fmt.Sprintf("%s:%d", cfg.MetricsConfig.Host, cfg.MetricsConfig.ServerPort)
 	metrics.Start(cfgLogger, addr, stakerMetrics.Registry)
 
-	err = service.RunUntilShutdown()
-	if err != nil {
+	if err = service.RunUntilShutdown(ctx); err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}

itest/bitcoind_node_setup.go

@@ -3,6 +3,7 @@ package e2etest
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/ory/dockertest/v3"
 	"os"
 	"strconv"
 	"strings"
@@ -34,24 +35,22 @@ type BitcoindTestHandler struct {
 	m *containers.Manager
 }
 
-func NewBitcoindHandler(t *testing.T) *BitcoindTestHandler {
-	m, err := containers.NewManager()
-	require.NoError(t, err)
+func NewBitcoindHandler(t *testing.T, m *containers.Manager) *BitcoindTestHandler {
 	return &BitcoindTestHandler{
 		t: t,
 		m: m,
 	}
 }
 
-func (h *BitcoindTestHandler) Start() {
+func (h *BitcoindTestHandler) Start() *dockertest.Resource {
 	tempPath, err := os.MkdirTemp("", "bitcoind-staker-test-*")
 	require.NoError(h.t, err)
 
 	h.t.Cleanup(func() {
 		_ = os.RemoveAll(tempPath)
 	})
 
-	_, err = h.m.RunBitcoindResource(tempPath)
+	bitcoinResource, err := h.m.RunBitcoindResource(h.t, tempPath)
 	require.NoError(h.t, err)
 
 	h.t.Cleanup(func() {
@@ -64,6 +63,7 @@ func (h *BitcoindTestHandler) Start() {
 		return err == nil
 	}, startTimeout, 500*time.Millisecond, "bitcoind did not start")
 
+	return bitcoinResource
 }
 
 func (h *BitcoindTestHandler) GetBlockCount() (int, error) {