Skip to content

Commit

Permalink
rename lotus-provider
Browse files Browse the repository at this point in the history
  • Loading branch information
LexLuthr authored and magik6k committed Apr 4, 2024
1 parent a1264c8 commit 800ae97
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion cmd/curio/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var cliCmd = &cli.Command{
Flags: []cli.Flag{
&cli.StringFlag{
Name: "machine",
Usage: "machine host:port (lotus-provider run --listen address)",
Usage: "machine host:port (curio run --listen address)",
},
},
Before: func(cctx *cli.Context) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/curio/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ func diff(sourceConf, newConf string) (string, error) {
}

func edit(editor, cfg string) (string, error) {
file, err := os.CreateTemp("", "lotus-provider-config-*.toml")
file, err := os.CreateTemp("", "curio-config-*.toml")
if err != nil {
return "", err
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/curio/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

var baseText string = `
[Subsystems]
# EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster
# EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
# with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
# machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
# will allow for parallel processing of partitions.
Expand All @@ -27,7 +27,7 @@ var baseText string = `
# type: int
#WindowPostMaxTasks = 0
# EnableWinningPost enables winning post to be executed on this lotus-provider instance.
# EnableWinningPost enables winning post to be executed on this curio instance.
# Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
# It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
# documentation.
Expand Down Expand Up @@ -106,7 +106,7 @@ var baseText string = `
#FinalizeMaxTasks = 0
# EnableSendPrecommitMsg enables the sending of precommit messages to the chain
# from this lotus-provider instance.
# from this curio instance.
# This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message
#
# type: bool
Expand All @@ -131,12 +131,12 @@ var baseText string = `
#PoRepProofMaxTasks = 0
# EnableSendCommitMsg enables the sending of commit messages to the chain
# from this lotus-provider instance.
# from this curio instance.
#
# type: bool
#EnableSendCommitMsg = false
# EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance.
# EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
# This tasks should only be enabled on nodes with long-term storage.
#
# The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
Expand All @@ -152,7 +152,7 @@ var baseText string = `
# type: int
#MoveStorageMaxTasks = 0
# EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should
# EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
# only need to be run on a single machine in the cluster.
#
# type: bool
Expand Down
2 changes: 1 addition & 1 deletion cmd/curio/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var storageAttachCmd = &cli.Command{
Usage: "attach local storage path",
ArgsUsage: "[path]",
Description: `Storage can be attached to the miner using this command. The storage volume
list is stored local to the miner in storage.json set in lotus-provider run. We do not
list is stored local to the miner in storage.json set in curio run. We do not
recommend manually modifying this value without further understanding of the
storage system.
Expand Down
12 changes: 6 additions & 6 deletions cmd/lotus-shed/deal.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ import (
)

var lpUtilCmd = &cli.Command{
Name: "provider-util",
Usage: "lotus provider utility commands",
Name: "curio-util",
Usage: "curio utility commands",
Subcommands: []*cli.Command{
lpUtilStartDealCmd,
},
}

var lpUtilStartDealCmd = &cli.Command{
Name: "start-deal",
Usage: "start a deal with a specific lotus-provider instance",
Usage: "start a deal with a specific curio instance",
ArgsUsage: "[dataFile] [miner]",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "provider-rpc",
Name: "curio-rpc",
Value: "http://127.0.0.1:12300",
},
},
Expand Down Expand Up @@ -73,7 +73,7 @@ var lpUtilStartDealCmd = &cli.Command{

// open rpc
var rpc api.CurioStruct
closer2, err := jsonrpc.NewMergeClient(ctx, cctx.String("provider-rpc"), "Filecoin", []interface{}{&rpc.Internal}, nil)
closer2, err := jsonrpc.NewMergeClient(ctx, cctx.String("curio-rpc"), "Filecoin", []interface{}{&rpc.Internal}, nil)
if err != nil {
return xerrors.Errorf("open rpc: %w", err)
}
Expand All @@ -84,7 +84,7 @@ var lpUtilStartDealCmd = &cli.Command{
return xerrors.Errorf("rpc version: %w", err)
}

fmt.Printf("* provider version: %s\n", v.String())
fmt.Printf("* curio version: %s\n", v.String())

// open data file
data, err := homedir.Expand(cctx.Args().Get(0))
Expand Down
2 changes: 1 addition & 1 deletion curiosrc/ffi/sdr_funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func (sb *SealCalls) LocalStorage(ctx context.Context) ([]storiface.StoragePath,
func (sb *SealCalls) FinalizeSector(ctx context.Context, sector storiface.SectorRef, keepUnsealed bool) error {
alloc := storiface.FTNone
if keepUnsealed {
// note: In lotus-provider we don't write the unsealed file in any of the previous stages, it's only written here from tree-d
// note: In Curio we don't write the unsealed file in any of the previous stages, it's only written here from tree-d
alloc = storiface.FTUnsealed
}

Expand Down
2 changes: 1 addition & 1 deletion curiosrc/market/fakelm/iface.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/filecoin-project/lotus/storage/sealer/storiface"
)

// MinimalLMApi is a subset of the LotusMiner API that is exposed by lotus-provider
// MinimalLMApi is a subset of the LotusMiner API that is exposed by Curio
// for consumption by boost
type MinimalLMApi interface {
ActorAddress(context.Context) (address.Address, error)
Expand Down
4 changes: 2 additions & 2 deletions curiosrc/seal/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Lotus-Provider Sealer
# Curio Sealer

## Overview

The lotus-provider sealer is a collection of harmony tasks and a common poller
The Curio sealer is a collection of harmony tasks and a common poller
which implement the sealing functionality of the Filecoin protocol.

## Pipeline Tasks
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/cli-curio.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ COMMANDS:
help, h Shows a list of commands or help for one command
OPTIONS:
--machine value machine host:port (lotus-provider run --listen address)
--machine value machine host:port (curio run --listen address)
--help, -h show help
```

Expand Down
12 changes: 6 additions & 6 deletions documentation/en/default-curio-config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Subsystems]
# EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster
# EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
# with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
# machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
# will allow for parallel processing of partitions.
Expand All @@ -14,7 +14,7 @@
# type: int
#WindowPostMaxTasks = 0

# EnableWinningPost enables winning post to be executed on this lotus-provider instance.
# EnableWinningPost enables winning post to be executed on this curio instance.
# Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
# It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
# documentation.
Expand Down Expand Up @@ -93,7 +93,7 @@
#FinalizeMaxTasks = 0

# EnableSendPrecommitMsg enables the sending of precommit messages to the chain
# from this lotus-provider instance.
# from this curio instance.
# This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message
#
# type: bool
Expand All @@ -118,12 +118,12 @@
#PoRepProofMaxTasks = 0

# EnableSendCommitMsg enables the sending of commit messages to the chain
# from this lotus-provider instance.
# from this curio instance.
#
# type: bool
#EnableSendCommitMsg = false

# EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance.
# EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
# This tasks should only be enabled on nodes with long-term storage.
#
# The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
Expand Down Expand Up @@ -160,7 +160,7 @@
# type: []string
#BoostAdapters = []

# EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should
# EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
# only need to be run on a single machine in the cluster.
#
# type: bool
Expand Down
12 changes: 6 additions & 6 deletions node/config/doc_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions node/config/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ type JournalConfig struct {
}

type CurioSubsystemsConfig struct {
// EnableWindowPost enables window post to be executed on this lotus-provider instance. Each machine in the cluster
// EnableWindowPost enables window post to be executed on this curio instance. Each machine in the cluster
// with WindowPoSt enabled will also participate in the window post scheduler. It is possible to have multiple
// machines with WindowPoSt enabled which will provide redundancy, and in case of multiple partitions per deadline,
// will allow for parallel processing of partitions.
Expand All @@ -105,7 +105,7 @@ type CurioSubsystemsConfig struct {
EnableWindowPost bool
WindowPostMaxTasks int

// EnableWinningPost enables winning post to be executed on this lotus-provider instance.
// EnableWinningPost enables winning post to be executed on this curio instance.
// Each machine in the cluster with WinningPoSt enabled will also participate in the winning post scheduler.
// It is possible to mix machines with WindowPoSt and WinningPoSt enabled, for details see the EnableWindowPost
// documentation.
Expand Down Expand Up @@ -166,7 +166,7 @@ type CurioSubsystemsConfig struct {
FinalizeMaxTasks int

// EnableSendPrecommitMsg enables the sending of precommit messages to the chain
// from this lotus-provider instance.
// from this curio instance.
// This runs after SDRTrees and uses the output CommD / CommR (roots of TreeD / TreeR) for the message
EnableSendPrecommitMsg bool

Expand All @@ -185,10 +185,10 @@ type CurioSubsystemsConfig struct {
PoRepProofMaxTasks int

// EnableSendCommitMsg enables the sending of commit messages to the chain
// from this lotus-provider instance.
// from this curio instance.
EnableSendCommitMsg bool

// EnableMoveStorage enables the move-into-long-term-storage task to run on this lotus-provider instance.
// EnableMoveStorage enables the move-into-long-term-storage task to run on this curio instance.
// This tasks should only be enabled on nodes with long-term storage.
//
// The MoveStorage task is the last task in the sealing pipeline. It moves the sealed sector data from the
Expand Down Expand Up @@ -219,7 +219,7 @@ type CurioSubsystemsConfig struct {
// a machine which handles ParkPiece tasks.
BoostAdapters []string

// EnableWebGui enables the web GUI on this lotus-provider instance. The UI has minimal local overhead, but it should
// EnableWebGui enables the web GUI on this curio instance. The UI has minimal local overhead, but it should
// only need to be run on a single machine in the cluster.
EnableWebGui bool

Expand Down

0 comments on commit 800ae97

Please sign in to comment.