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

Merge pull request #10594 from filecoin-project/phi/v1210-rc2

Browse Source 
build: release: v1.21.0-rc2
This commit is contained in:
Jiaying Wang
2023-03-29 15:59:56 -04:00
committed by GitHub
parent b40ab4bd44 a724a713da
commit caa6dd9c41
74 changed files with 186 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/lotus-bench/import.go
+1 -2
View File
@@ -6,7 +6,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"math"
"net/http"
_ "net/http/pprof"
@@ -158,7 +157,7 @@ var importBenchCmd = &cli.Command{
if rdir := cctx.String("repodir"); rdir != "" {
tdir = rdir
} else {
tmp, err := ioutil.TempDir("", "lotus-import-bench")
tmp, err := os.MkdirTemp("", "lotus-import-bench")
if err != nil {
return err
}
cmd/lotus-bench/main.go
+4 -5
View File
@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"math/big"
"math/rand"
"os"
@@ -197,7 +196,7 @@ var sealBenchCmd = &cli.Command{
return xerrors.Errorf("creating sectorbuilder dir: %w", err)
}
tsdir, err := ioutil.TempDir(sdir, "bench")
tsdir, err := os.MkdirTemp(sdir, "bench")
if err != nil {
return err
}
@@ -287,7 +286,7 @@ var sealBenchCmd = &cli.Command{
// sectorbuilder directory... we need a better way to handle
// this in other cases
fdata, err := ioutil.ReadFile(filepath.Join(sbdir, "pre-seal-"+maddr.String()+".json"))
fdata, err := os.ReadFile(filepath.Join(sbdir, "pre-seal-"+maddr.String()+".json"))
if err != nil {
return err
}
@@ -637,7 +636,7 @@ func runSeals(sb *ffiwrapper.Sealer, sbfs *basicfs.Provider, numSectors int, par
return err
}
if err := ioutil.WriteFile(saveC2inp, b, 0664); err != nil {
if err := os.WriteFile(saveC2inp, b, 0664); err != nil {
log.Warnf("%+v", err)
}
}
@@ -751,7 +750,7 @@ var proveCmd = &cli.Command{
return xerrors.Errorf("Usage: lotus-bench prove [input.json]")
}
inb, err := ioutil.ReadFile(c.Args().First())
inb, err := os.ReadFile(c.Args().First())
if err != nil {
return xerrors.Errorf("reading input file: %w", err)
}
cmd/lotus-bench/simple.go
+4 -5
View File
@@ -5,7 +5,6 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"strconv"
"time"
@@ -444,7 +443,7 @@ var simpleCommit1 = &cli.Command{
return err
}
if err := ioutil.WriteFile(cctx.Args().Get(4), b, 0664); err != nil {
if err := os.WriteFile(cctx.Args().Get(4), b, 0664); err != nil {
log.Warnf("%+v", err)
}
@@ -478,7 +477,7 @@ var simpleCommit2 = &cli.Command{
return xerrors.Errorf("Usage: lotus-bench prove [input.json]")
}
inb, err := ioutil.ReadFile(c.Args().First())
inb, err := os.ReadFile(c.Args().First())
if err != nil {
return xerrors.Errorf("reading input file: %w", err)
}
@@ -861,7 +860,7 @@ var simpleProveReplicaUpdate1 = &cli.Command{
return xerrors.Errorf("json marshal vanilla proofs: %w", err)
}
if err := ioutil.WriteFile(cctx.Args().Get(7), vpjb, 0666); err != nil {
if err := os.WriteFile(cctx.Args().Get(7), vpjb, 0666); err != nil {
return xerrors.Errorf("writing vanilla proofs file: %w", err)
}
@@ -934,7 +933,7 @@ var simpleProveReplicaUpdate2 = &cli.Command{
return xerrors.Errorf("parse commr: %w", err)
}
vpb, err := ioutil.ReadFile(cctx.Args().Get(3))
vpb, err := os.ReadFile(cctx.Args().Get(3))
if err != nil {
return xerrors.Errorf("reading valilla proof file: %w", err)
}
cmd/lotus-fountain/recaptcha.go
+2 -2
View File
@@ -6,7 +6,7 @@ package main
import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"net/url"
"os"
@@ -63,7 +63,7 @@ func VerifyToken(token, remoteIP string) (Response, error) {
return resp, err
}
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
_ = r.Body.Close() // close immediately after reading finished
if err != nil {
return resp, err
cmd/lotus-miner/init.go
+2 -3
View File
@@ -7,7 +7,6 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"path/filepath"
@@ -246,7 +245,7 @@ var initCmd = &cli.Command{
return xerrors.Errorf("marshaling storage config: %w", err)
}
if err := ioutil.WriteFile(filepath.Join(lr.Path(), "sectorstore.json"), b, 0644); err != nil {
if err := os.WriteFile(filepath.Join(lr.Path(), "sectorstore.json"), b, 0644); err != nil {
return xerrors.Errorf("persisting storage metadata (%s): %w", filepath.Join(lr.Path(), "sectorstore.json"), err)
}
@@ -292,7 +291,7 @@ func migratePreSealMeta(ctx context.Context, api v1api.FullNode, metadata string
return xerrors.Errorf("expanding preseal dir: %w", err)
}
b, err := ioutil.ReadFile(metadata)
b, err := os.ReadFile(metadata)
if err != nil {
return xerrors.Errorf("reading preseal metadata: %w", err)
}
cmd/lotus-miner/init_restore.go
+1 -2
View File
@@ -3,7 +3,6 @@ package main
import (
"context"
"encoding/json"
"io/ioutil"
"os"
"github.com/docker/go-units"
@@ -59,7 +58,7 @@ var restoreCmd = &cli.Command{
return xerrors.Errorf("expanding storage config path: %w", err)
}
cfb, err := ioutil.ReadFile(cf)
cfb, err := os.ReadFile(cf)
if err != nil {
return xerrors.Errorf("reading storage config: %w", err)
}
cmd/lotus-miner/storage.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"math/bits"
"os"
"path/filepath"
@@ -167,7 +166,7 @@ over time
return xerrors.Errorf("marshaling storage config: %w", err)
}
if err := ioutil.WriteFile(filepath.Join(p, metaFile), b, 0644); err != nil {
if err := os.WriteFile(filepath.Join(p, metaFile), b, 0644); err != nil {
return xerrors.Errorf("persisting storage metadata (%s): %w", filepath.Join(p, metaFile), err)
}
}
cmd/lotus-pcr/main.go
+2 -3
View File
@@ -7,7 +7,6 @@ import (
"encoding/csv"
"fmt"
"io"
"io/ioutil"
"net/http"
_ "net/http/pprof"
"os"
@@ -759,7 +758,7 @@ func (r *refunder) EnsureMinerMinimums(ctx context.Context, tipset *types.TipSet
return nil, err
}
w := ioutil.Discard
w := io.Discard
if len(output) != 0 {
f, err := os.Create(output)
if err != nil {
@@ -1299,7 +1298,7 @@ func loadChainEpoch(fn string) (abi.ChainEpoch, error) {
err = f.Close()
}()
raw, err := ioutil.ReadAll(f)
raw, err := io.ReadAll(f)
if err != nil {
return 0, err
}
cmd/lotus-seed/genesis.go
+14 -15
View File
@@ -4,7 +4,6 @@ import (
"encoding/csv"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"strconv"
"strings"
@@ -80,7 +79,7 @@ var genesisNewCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, genb, 0644); err != nil {
if err := os.WriteFile(genf, genb, 0644); err != nil {
return err
}
@@ -103,7 +102,7 @@ var genesisAddMinerCmd = &cli.Command{
}
var template genesis.Template
genb, err := ioutil.ReadFile(genf)
genb, err := os.ReadFile(genf)
if err != nil {
return xerrors.Errorf("read genesis template: %w", err)
}
@@ -117,7 +116,7 @@ var genesisAddMinerCmd = &cli.Command{
return xerrors.Errorf("expand preseal file path: %w", err)
}
miners := map[string]genesis.Miner{}
minb, err := ioutil.ReadFile(minf)
minb, err := os.ReadFile(minf)
if err != nil {
return xerrors.Errorf("read preseal file: %w", err)
}
@@ -156,7 +155,7 @@ var genesisAddMinerCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, genb, 0644); err != nil {
if err := os.WriteFile(genf, genb, 0644); err != nil {
return err
}
@@ -196,7 +195,7 @@ var genesisAddMsigsCmd = &cli.Command{
}
var template genesis.Template
b, err := ioutil.ReadFile(genf)
b, err := os.ReadFile(genf)
if err != nil {
return xerrors.Errorf("read genesis template: %w", err)
}
@@ -237,7 +236,7 @@ var genesisAddMsigsCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
if err := os.WriteFile(genf, b, 0644); err != nil {
return err
}
return nil
@@ -339,7 +338,7 @@ var genesisSetVRKCmd = &cli.Command{
}
var template genesis.Template
b, err := ioutil.ReadFile(genf)
b, err := os.ReadFile(genf)
if err != nil {
return xerrors.Errorf("read genesis template: %w", err)
}
@@ -404,7 +403,7 @@ var genesisSetVRKCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
if err := os.WriteFile(genf, b, 0644); err != nil {
return err
}
return nil
@@ -435,7 +434,7 @@ var genesisSetRemainderCmd = &cli.Command{
}
var template genesis.Template
b, err := ioutil.ReadFile(genf)
b, err := os.ReadFile(genf)
if err != nil {
return xerrors.Errorf("read genesis template: %w", err)
}
@@ -500,7 +499,7 @@ var genesisSetRemainderCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
if err := os.WriteFile(genf, b, 0644); err != nil {
return err
}
return nil
@@ -529,7 +528,7 @@ var genesisSetActorVersionCmd = &cli.Command{
}
var template genesis.Template
b, err := ioutil.ReadFile(genf)
b, err := os.ReadFile(genf)
if err != nil {
return xerrors.Errorf("read genesis template: %w", err)
}
@@ -550,7 +549,7 @@ var genesisSetActorVersionCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
if err := os.WriteFile(genf, b, 0644); err != nil {
return err
}
return nil
@@ -607,7 +606,7 @@ var genesisSetVRKSignersCmd = &cli.Command{
}
var template genesis.Template
b, err := ioutil.ReadFile(genf)
b, err := os.ReadFile(genf)
if err != nil {
return xerrors.Errorf("read genesis template: %w", err)
}
@@ -662,7 +661,7 @@ var genesisSetVRKSignersCmd = &cli.Command{
return err
}
if err := ioutil.WriteFile(genf, b, 0644); err != nil {
if err := os.WriteFile(genf, b, 0644); err != nil {
return err
}
return nil
cmd/lotus-seed/main.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"github.com/docker/go-units"
@@ -114,7 +113,7 @@ var preSealCmd = &cli.Command{
var k *types.KeyInfo
if c.String("key") != "" {
k = new(types.KeyInfo)
kh, err := ioutil.ReadFile(c.String("key"))
kh, err := os.ReadFile(c.String("key"))
if err != nil {
return err
}
cmd/lotus-seed/seed/seed.go
+3 -4
View File
@@ -6,7 +6,6 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -135,7 +134,7 @@ func PreSeal(maddr address.Address, spt abi.RegisteredSealProof, offset abi.Sect
return nil, nil, xerrors.Errorf("marshaling storage config: %w", err)
}
if err := ioutil.WriteFile(filepath.Join(sbroot, "sectorstore.json"), b, 0644); err != nil {
if err := os.WriteFile(filepath.Join(sbroot, "sectorstore.json"), b, 0644); err != nil {
return nil, nil, xerrors.Errorf("persisting storage metadata (%s): %w", filepath.Join(sbroot, "storage.json"), err)
}
}
@@ -228,7 +227,7 @@ func WriteGenesisMiner(maddr address.Address, sbroot string, gm *genesis.Miner,
log.Infof("Writing preseal manifest to %s", filepath.Join(sbroot, "pre-seal-"+maddr.String()+".json"))
if err := ioutil.WriteFile(filepath.Join(sbroot, "pre-seal-"+maddr.String()+".json"), out, 0664); err != nil {
if err := os.WriteFile(filepath.Join(sbroot, "pre-seal-"+maddr.String()+".json"), out, 0664); err != nil {
return err
}
@@ -239,7 +238,7 @@ func WriteGenesisMiner(maddr address.Address, sbroot string, gm *genesis.Miner,
}
// TODO: allow providing key
if err := ioutil.WriteFile(filepath.Join(sbroot, "pre-seal-"+maddr.String()+".key"), []byte(hex.EncodeToString(b)), 0664); err != nil {
if err := os.WriteFile(filepath.Join(sbroot, "pre-seal-"+maddr.String()+".key"), []byte(hex.EncodeToString(b)), 0664); err != nil {
return err
}
}
cmd/lotus-shed/base16.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"encoding/hex"
"fmt"
"io"
"io/ioutil"
"os"
"strings"
@@ -30,7 +29,7 @@ var base16Cmd = &cli.Command{
input = strings.NewReader(cctx.Args().First())
}
bytes, err := ioutil.ReadAll(input)
bytes, err := io.ReadAll(input)
if err != nil {
return nil
}
cmd/lotus-shed/base32.go
+1 -2
View File
@@ -3,7 +3,6 @@ package main
import (
"fmt"
"io"
"io/ioutil"
"os"
"strings"
@@ -30,7 +29,7 @@ var base32Cmd = &cli.Command{
input = strings.NewReader(cctx.Args().First())
}
bytes, err := ioutil.ReadAll(input)
bytes, err := io.ReadAll(input)
if err != nil {
return nil
}
cmd/lotus-shed/base64.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"encoding/base64"
"fmt"
"io"
"io/ioutil"
"os"
"strings"
@@ -38,7 +37,7 @@ var base64Cmd = &cli.Command{
input = strings.NewReader(cctx.Args().First())
}
bytes, err := ioutil.ReadAll(input)
bytes, err := io.ReadAll(input)
if err != nil {
return nil
}
cmd/lotus-shed/bitfield.go
+1 -2
View File
@@ -5,7 +5,6 @@ import (
"encoding/hex"
"fmt"
"io"
"io/ioutil"
"os"
"github.com/urfave/cli/v2"
@@ -318,7 +317,7 @@ func decodeToByte(cctx *cli.Context, i int) ([]byte, error) {
if i > 0 {
return nil, xerrors.Errorf("need more than %d args", i)
}
r, err := ioutil.ReadAll(os.Stdin)
r, err := io.ReadAll(os.Stdin)
if err != nil {
return nil, err
}
cmd/lotus-shed/fip-0036.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"os"
"sort"
"strconv"
@@ -537,7 +537,7 @@ var finalResultCmd = &cli.Command{
// Returns voted sorted by votes from earliest to latest
func getVotesMap(file string) ([]Vote, error) {
var votes []Vote
vb, err := ioutil.ReadFile(file)
vb, err := os.ReadFile(file)
if err != nil {
return nil, xerrors.Errorf("read vote: %w", err)
}
cmd/lotus-shed/jwt.go
+4 -5
View File
@@ -7,7 +7,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"os"
"strings"
@@ -81,7 +80,7 @@ var jwtTokenCmd = &cli.Command{
defer inputFile.Close() //nolint:errcheck
input := bufio.NewReader(inputFile)
encoded, err := ioutil.ReadAll(input)
encoded, err := io.ReadAll(input)
if err != nil {
return err
}
@@ -123,7 +122,7 @@ var jwtTokenCmd = &cli.Command{
return err
}
return ioutil.WriteFile(cctx.String("output"), token, 0600)
return os.WriteFile(cctx.String("output"), token, 0600)
},
}
@@ -142,7 +141,7 @@ var jwtNewCmd = &cli.Command{
keyName := cctx.Args().First()
sk, err := ioutil.ReadAll(io.LimitReader(rand.Reader, 32))
sk, err := io.ReadAll(io.LimitReader(rand.Reader, 32))
if err != nil {
return err
}
@@ -184,6 +183,6 @@ var jwtNewCmd = &cli.Command{
}
filenameToken := fmt.Sprintf("jwt-%s.token", keyName)
return ioutil.WriteFile(filenameToken, token, 0600)
return os.WriteFile(filenameToken, token, 0600)
},
}
cmd/lotus-shed/keyinfo.go
+3 -4
View File
@@ -7,7 +7,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"os"
"path"
"strings"
@@ -68,7 +67,7 @@ var keyinfoVerifyCmd = &cli.Command{
defer inputFile.Close() //nolint:errcheck
input := bufio.NewReader(inputFile)
keyContent, err := ioutil.ReadAll(input)
keyContent, err := io.ReadAll(input)
if err != nil {
return err
}
@@ -162,7 +161,7 @@ var keyinfoImportCmd = &cli.Command{
input = bufio.NewReader(inputFile)
}
encoded, err := ioutil.ReadAll(input)
encoded, err := io.ReadAll(input)
if err != nil {
return err
}
@@ -274,7 +273,7 @@ var keyinfoInfoCmd = &cli.Command{
input = bufio.NewReader(inputFile)
}
encoded, err := ioutil.ReadAll(input)
encoded, err := io.ReadAll(input)
if err != nil {
return err
}
cmd/lotus-shed/rpc.go
+1 -2
View File
@@ -6,7 +6,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@@ -97,7 +96,7 @@ var rpcCmd = &cli.Command{
return err
}
rb, err := ioutil.ReadAll(resp.Body)
rb, err := io.ReadAll(resp.Body)
if err != nil {
return err
}
cmd/lotus-worker/main.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
@@ -464,7 +463,7 @@ var runCmd = &cli.Command{
return xerrors.Errorf("marshaling storage config: %w", err)
}
if err := ioutil.WriteFile(filepath.Join(lr.Path(), "sectorstore.json"), b, 0644); err != nil {
if err := os.WriteFile(filepath.Join(lr.Path(), "sectorstore.json"), b, 0644); err != nil {
return xerrors.Errorf("persisting storage metadata (%s): %w", filepath.Join(lr.Path(), "sectorstore.json"), err)
}
cmd/lotus-worker/storage.go
+1 -2
View File
@@ -2,7 +2,6 @@ package main
import (
"encoding/json"
"io/ioutil"
"os"
"path/filepath"
@@ -121,7 +120,7 @@ var storageAttachCmd = &cli.Command{
return xerrors.Errorf("marshaling storage config: %w", err)
}
if err := ioutil.WriteFile(filepath.Join(p, metaFile), b, 0644); err != nil {
if err := os.WriteFile(filepath.Join(p, metaFile), b, 0644); err != nil {
return xerrors.Errorf("persisting storage metadata (%s): %w", filepath.Join(p, metaFile), err)
}
}
cmd/lotus/daemon.go
+2 -3
View File
@@ -10,7 +10,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"runtime/pprof"
@@ -244,7 +243,7 @@ var DaemonCmd = &cli.Command{
var genBytes []byte
if cctx.String("genesis") != "" {
genBytes, err = ioutil.ReadFile(cctx.String("genesis"))
genBytes, err = os.ReadFile(cctx.String("genesis"))
if err != nil {
return xerrors.Errorf("reading genesis: %w", err)
}
@@ -400,7 +399,7 @@ func importKey(ctx context.Context, api lapi.FullNode, f string) error {
return err
}
hexdata, err := ioutil.ReadFile(f)
hexdata, err := os.ReadFile(f)
if err != nil {
return err
}