Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix builder options #21

Merged
merged 1 commit into from
Oct 29, 2021
Merged

fix builder options #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions models/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,33 +135,39 @@ func NewClientTransferDS(ds repo.MetadataDS) repo.ClientTransferDS {
return namespace.Wrap(ds, datastore.NewKey(clientTransfer))
}

var DBOptions = func(server bool, mysql2 *config.Mysql) builder.Option {
var DBOptions = func(server bool, mysqlCfg *config.Mysql) builder.Option {
if server {
return builder.Options(
commonOpts := builder.Options(
builder.Override(new(repo.MetadataDS), NewMetadataDS),
builder.Override(new(StagingDS), NewStagingDS),
builder.Override(new(StagingBlockstore), NewStagingBlockStore),
builder.Override(new(repo.PieceMetaDs), NewPieceMetaDs),
builder.Override(new(repo.PieceInfoDS), NewPieceInfoDs),
builder.Override(new(repo.CIDInfoDS), NewCidInfoDs),
builder.Override(new(repo.RetrievalProviderDS), NewRetrievalProviderDS),
builder.Override(new(repo.RetrievalAskDS), NewRetrievalAskDS),
builder.Override(new(repo.DagTransferDS), NewDagTransferDS),
builder.Override(new(repo.ProviderDealDS), NewProviderDealDS),
builder.Override(new(repo.StorageAskDS), NewStorageAskDS),
builder.Override(new(StagingBlockstore), NewStagingBlockStore),
builder.Override(new(repo.PayChanDS), NewPayChanDS),
builder.Override(new(repo.FundMgrDS), NewFundMgrDS),
builder.Override(new(repo.Repo), badger_models.NewBadgerRepo),
// if there is a mysql connection string exist,
// use mysql storage_ask_ds, otherwise use a badger
builder.ApplyIf(func(s *builder.Settings) bool { return len(mysql2.ConnectionString) > 0 },
builder.Override(new(repo.Repo), func(cfg *config.Mysql) (repo.Repo, error) {
return mysql.InitMysql(cfg)
})),
builder.Override(new(repo.IStorageAskRepo), func(repo repo.Repo) repo.IStorageAskRepo { return repo.StorageAskRepo() }),
builder.Override(new(repo.IRetrievalAskRepo), func(repo repo.Repo) repo.IRetrievalAskRepo { return repo.RetrievalAskRepo() }),
)
var opts builder.Option
if len(mysqlCfg.ConnectionString) > 0 {
opts = builder.Override(new(repo.Repo), func() (repo.Repo, error) {
return mysql.InitMysql(mysqlCfg)
})
} else {
opts = builder.Options(
builder.Override(new(repo.PieceInfoDS), NewPieceInfoDs),
builder.Override(new(repo.CIDInfoDS), NewCidInfoDs),
builder.Override(new(repo.RetrievalProviderDS), NewRetrievalProviderDS),
builder.Override(new(repo.RetrievalAskDS), NewRetrievalAskDS),
builder.Override(new(repo.ProviderDealDS), NewProviderDealDS),
builder.Override(new(repo.StorageAskDS), NewStorageAskDS),
builder.Override(new(repo.PayChanDS), NewPayChanDS),
builder.Override(new(repo.FundMgrDS), NewFundMgrDS),
builder.Override(new(repo.Repo), func(fundDS repo.FundMgrDS, dealDS repo.ProviderDealDS,
paychDS repo.PayChanDS, askDS repo.StorageAskDS, retrAskDs repo.RetrievalAskDS,
pieceDs repo.PieceInfoDS, cidInfoDs repo.CIDInfoDS, retrievalDs repo.RetrievalProviderDS) (repo.Repo, error) {
return badger_models.NewBadgerRepo(fundDS, dealDS, paychDS, askDS, retrAskDs, pieceDs, cidInfoDs, retrievalDs)
}),
)
}
return builder.Options(commonOpts, opts)
} else {
return builder.Options(
builder.Override(new(repo.MetadataDS), NewMetadataDS),
Expand Down
5 changes: 3 additions & 2 deletions retrievaladapter/ask_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package retrievaladapter

import (
"context"

"github.com/filecoin-project/venus-market/models/repo"

"github.com/filecoin-project/go-address"
Expand Down Expand Up @@ -30,8 +31,8 @@ type AskHandler struct {
retrievalPricingFunc retrievalimpl.RetrievalPricingFunc
}

func NewAskHandler(askStore repo.IRetrievalAskRepo, node retrievalmarket.RetrievalProviderNode, retrievalPricingFunc retrievalimpl.RetrievalPricingFunc) *AskHandler {
return &AskHandler{askStore: askStore, node: node, retrievalPricingFunc: retrievalPricingFunc}
func NewAskHandler(r repo.Repo, node retrievalmarket.RetrievalProviderNode, retrievalPricingFunc retrievalimpl.RetrievalPricingFunc) *AskHandler {
return &AskHandler{askStore: r.RetrievalAskRepo(), node: node, retrievalPricingFunc: retrievalPricingFunc}
}

// GetAsk returns the current deal parameters this provider accepts
Expand Down