cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix compilation

Browse Source
This commit is contained in:
aarshkshah1992 2021-06-14 10:10:29 +05:30
parent bed2bc73a3
commit 4419205b0e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/builder.go
View File

@ -411,7 +411,7 @@ var MinerNode = Options(
Override(new(sectorstorage.PieceProvider), sectorstorage.NewPieceProvider), Override(new(sectorstorage.PieceProvider), sectorstorage.NewPieceProvider),
Override(new(dtypes.RetrievalPricingFunc), modules.RetrievalPricingFunc(config.DealmakingConfig{ Override(new(dtypes.RetrievalPricingFunc), modules.RetrievalPricingFunc(config.DealmakingConfig{
RetrievalPricing: &config.RetrievalPricing{ RetrievalPricing: &config.RetrievalPricing{
Strategy: config.DefaultRetrievalPricing, Strategy: config.RetrievalPricingDefaultMode,
Default: &config.RetrievalPricingDefault{}, Default: &config.RetrievalPricingDefault{},
}, },
})), })),
@ -573,7 +573,7 @@ func ConfigStorageMiner(c interface{}) Option {
} }
pricingConfig := cfg.Dealmaking.RetrievalPricing pricingConfig := cfg.Dealmaking.RetrievalPricing
if pricingConfig.Strategy == config.ExternalRetrievalPricing { if pricingConfig.Strategy == config.RetrievalPricingExternalMode {
if pricingConfig.External == nil { if pricingConfig.External == nil {
return Error(xerrors.New("retrieval pricing policy has been to set to external but external policy config is nil")) return Error(xerrors.New("retrieval pricing policy has been to set to external but external policy config is nil"))
} }
@ -581,7 +581,7 @@ func ConfigStorageMiner(c interface{}) Option {
if pricingConfig.External.Path == "" { if pricingConfig.External.Path == "" {
return Error(xerrors.New("retrieval pricing policy has been to set to external but external script path is empty")) return Error(xerrors.New("retrieval pricing policy has been to set to external but external script path is empty"))
} }
} else if pricingConfig.Strategy != config.DefaultRetrievalPricing { } else if pricingConfig.Strategy != config.RetrievalPricingDefaultMode {
return Error(xerrors.New("retrieval pricing policy must be either default or external")) return Error(xerrors.New("retrieval pricing policy must be either default or external"))
} }

6
node/config/def.go
View File

@ -16,10 +16,10 @@ import (
const ( const (
// RetrievalPricingDefault configures the node to use the default retrieval pricing policy. // RetrievalPricingDefault configures the node to use the default retrieval pricing policy.
RetrievalPricingDefault = "default" RetrievalPricingDefaultMode = "default"
// RetrievalPricingExternal configures the node to use the external retrieval pricing script // RetrievalPricingExternal configures the node to use the external retrieval pricing script
// configured by the user. // configured by the user.
RetrievalPricingExternal = "external" RetrievalPricingExternalMode = "external"
) )
// Common is common config between full node and miner // Common is common config between full node and miner
@ -355,7 +355,7 @@ func DefaultStorageMiner() *StorageMiner {
MaxProviderCollateralMultiplier: 2, MaxProviderCollateralMultiplier: 2,
RetrievalPricing: &RetrievalPricing{ RetrievalPricing: &RetrievalPricing{
Strategy: DefaultRetrievalPricing, Strategy: RetrievalPricingDefaultMode,
Default: &RetrievalPricingDefault{ Default: &RetrievalPricingDefault{
VerifiedDealsFreeTransfer: true, VerifiedDealsFreeTransfer: true,
}, },

2
node/modules/storageminer.go
View File

@ -641,7 +641,7 @@ func RetrievalPricingFunc(cfg config.DealmakingConfig) func(_ dtypes.ConsiderOnl
return func(_ dtypes.ConsiderOnlineRetrievalDealsConfigFunc, return func(_ dtypes.ConsiderOnlineRetrievalDealsConfigFunc,
_ dtypes.ConsiderOfflineRetrievalDealsConfigFunc) dtypes.RetrievalPricingFunc { _ dtypes.ConsiderOfflineRetrievalDealsConfigFunc) dtypes.RetrievalPricingFunc {
if cfg.RetrievalPricing.Strategy == config.ExternalRetrievalPricing { if cfg.RetrievalPricing.Strategy == config.RetrievalPricingExternalMode {
return pricing.ExternalRetrievalPricingFunc(cfg.RetrievalPricing.External.Path) return pricing.ExternalRetrievalPricingFunc(cfg.RetrievalPricing.External.Path)
} }