[persistence/contract] move pebble db init to main (#536)

Author: huangzhiran

cmd/coordinator/main.go

@@ -7,6 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/cockroachdb/pebble"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
@@ -51,13 +52,18 @@ func main() {
 
 	var contractPersistence *contract.Contract
 	if !local {
-		contractPersistence, err = contract.New(conf.SchedulerEpoch, conf.BeginningBlockNumber, conf.LocalDBDir,
+		db, err := pebble.Open(conf.LocalDBDir, &pebble.Options{})
+		if err != nil {
+			log.Fatal(errors.Wrap(err, "failed to open pebble db"))
+		}
+		defer db.Close()
+
+		contractPersistence, err = contract.New(db, conf.SchedulerEpoch, conf.BeginningBlockNumber,
 			conf.ChainEndpoint, common.HexToAddress(conf.ProverContractAddr),
 			common.HexToAddress(conf.ProjectContractAddr), chainHeadNotifications, projectNotifications)
 		if err != nil {
 			log.Fatal(errors.Wrap(err, "failed to new contract persistence"))
 		}
-		defer contractPersistence.Release()
 	}
 
 	var projectManager *project.Manager

cmd/prover/main.go

@@ -7,6 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/cockroachdb/pebble"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -64,13 +65,18 @@ func main() {
 
 	var contractPersistence *contract.Contract
 	if !local {
-		contractPersistence, err = contract.New(conf.SchedulerEpoch, conf.BeginningBlockNumber, conf.LocalDBDir,
+		db, err := pebble.Open(conf.LocalDBDir, &pebble.Options{})
+		if err != nil {
+			log.Fatal(errors.Wrap(err, "failed to open pebble db"))
+		}
+		defer db.Close()
+
+		contractPersistence, err = contract.New(db, conf.SchedulerEpoch, conf.BeginningBlockNumber,
 			conf.ChainEndpoint, common.HexToAddress(conf.ProverContractAddr),
 			common.HexToAddress(conf.ProjectContractAddr), chainHeadNotifications, projectNotifications)
 		if err != nil {
 			log.Fatal(errors.Wrap(err, "failed to new contract persistence"))
 		}
-		defer contractPersistence.Release()
 	}
 
 	proverID := uint64(0)

cmd/stresstest/main.go

@@ -17,6 +17,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/cockroachdb/pebble"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -232,12 +233,17 @@ func main() {
 
 	projectNotifications := []chan<- uint64{projectManagerNotification}
 
-	contractPersistence, err := contract.New(schedulerEpoch, beginningBlockNumber, localDBDir, chainEndpoint, proverContractAddress,
+	db, err := pebble.Open(localDBDir, &pebble.Options{})
+	if err != nil {
+		log.Fatal(errors.Wrap(err, "failed to open pebble db"))
+	}
+	defer db.Close()
+
+	contractPersistence, err := contract.New(db, schedulerEpoch, beginningBlockNumber, chainEndpoint, proverContractAddress,
 		projectContractAddress, nil, projectNotifications)
 	if err != nil {
 		log.Fatal(errors.Wrap(err, "failed to new contract persistence"))
 	}
-	defer contractPersistence.Release()
 
 	updateProjectRequiredProverTicker := time.NewTicker(1 * time.Hour)
 	go func() {

persistence/contract/contract.go

@@ -440,18 +440,7 @@ func (c *Contract) watch(listedBlockNumber uint64) {
 	}()
 }
 
-func (c *Contract) Release() {
-	if err := c.db.Close(); err != nil {
-		slog.Error("failed to close pebble db", "error", err)
-	}
-}
-
-func New(size, beginningBlockNumber uint64, localDBDir, chainEndpoint string, proverContractAddr, projectContractAddr common.Address, chainHeadNotifications []chan<- uint64, projectNotifications []chan<- uint64) (*Contract, error) {
-	db, err := pebble.Open(localDBDir, &pebble.Options{})
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to open pebble db")
-	}
-
+func New(db *pebble.DB, size, beginningBlockNumber uint64, chainEndpoint string, proverContractAddr, projectContractAddr common.Address, chainHeadNotifications []chan<- uint64, projectNotifications []chan<- uint64) (*Contract, error) {
 	client, err := ethclient.Dial(chainEndpoint)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to dial chain endpoint")