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

fix tests.

Browse Source
This commit is contained in:
Raúl Kripalani 2021-07-29 13:21:55 +01:00 committed by Jennifer Wang
parent 107777fdac
commit 1b5a2dd79a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/util/api.go
View File

@ -117,7 +117,7 @@ func GetAPIInfo(ctx *cli.Context, t repo.RepoType) (APIInfo, error) {
for _, env := range deprecatedEnv { for _, env := range deprecatedEnv {
env, ok := os.LookupEnv(env) env, ok := os.LookupEnv(env)
if ok { if ok {
log.Warnf("Use deprecation env(%s) value, please use env(%s) instead.", env, currentEnv) log.Warnf("Using deprecated env(%s) value, please use env(%s) instead.", env, currentEnv)
return ParseApiInfo(env), nil return ParseApiInfo(env), nil
} }
} }
@ -125,6 +125,7 @@ func GetAPIInfo(ctx *cli.Context, t repo.RepoType) (APIInfo, error) {
repoFlags := flagsForRepo(t) repoFlags := flagsForRepo(t)
for _, f := range repoFlags { for _, f := range repoFlags {
if !ctx.IsSet(f) { if !ctx.IsSet(f) {
fmt.Println("not set", f)
continue continue
} }
@ -154,7 +155,7 @@ func GetAPIInfo(ctx *cli.Context, t repo.RepoType) (APIInfo, error) {
}, nil }, nil
} }
return APIInfo{}, fmt.Errorf("could not determine API endpoint for node type: %s", t) return APIInfo{}, fmt.Errorf("could not determine API endpoint for node type: %v", t)
} }
func GetRawAPI(ctx *cli.Context, t repo.RepoType, version string) (string, http.Header, error) { func GetRawAPI(ctx *cli.Context, t repo.RepoType, version string) (string, http.Header, error) {
@ -297,6 +298,11 @@ func GetWorkerAPI(ctx *cli.Context) (api.Worker, jsonrpc.ClientCloser, error) {
} }
func GetMarketsAPI(ctx *cli.Context) (api.StorageMiner, jsonrpc.ClientCloser, error) { func GetMarketsAPI(ctx *cli.Context) (api.StorageMiner, jsonrpc.ClientCloser, error) {
// to support lotus-miner cli tests.
if tn, ok := ctx.App.Metadata["testnode-storage"]; ok {
return tn.(api.StorageMiner), func() {}, nil
}
addr, headers, err := GetRawAPI(ctx, repo.Markets, "v0") addr, headers, err := GetRawAPI(ctx, repo.Markets, "v0")
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err