chore: types: remove more items forgotten after markets (#12095)

* chore: cleanup: remove more items forgotten after markets

* .gz somehow reappeared after #11625

Author: ribasushi

.github/pull_request_template.md

@@ -15,7 +15,7 @@ Before you mark the PR ready for review, please make sure that:
 - [ ] PR title is in the form of of `<PR type>: <area>: <change being made>`
   - example: ` fix: mempool: Introduce a cache for valid signatures`
   - `PR type`: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
-  - `area`, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
+  - `area`, e.g. api, chain, state, mempool, multisig, networking, paych, proving, sealing, wallet, deps
 - [ ] If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
 - [ ] New features have usage guidelines and / or documentation updates in
   - [ ] [Lotus Documentation](https://lotus.filecoin.io)

api/api_full.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 
@@ -1052,8 +1051,6 @@ type MarketDeal struct {
 	State    MarketDealState
 }
 
-type RemoteStoreID = uuid.UUID
-
 type InvocResult struct {
 	MsgCid         cid.Cid
 	Msg            *types.Message
@@ -1064,11 +1061,6 @@ type InvocResult struct {
 	Duration       time.Duration
 }
 
-type MethodCall struct {
-	types.MessageReceipt
-	Error string
-}
-
 type IpldObject struct {
 	Cid cid.Cid
 	Obj interface{}
@@ -1180,21 +1172,6 @@ type BlockTemplate struct {
 	WinningPoStProof []builtin.PoStProof
 }
 
-type DataSize struct {
-	PayloadSize int64
-	PieceSize   abi.PaddedPieceSize
-}
-
-type DataCIDSize struct {
-	PayloadSize int64
-	PieceSize   abi.PaddedPieceSize
-	PieceCID    cid.Cid
-}
-
-type CommPRet struct {
-	Root cid.Cid
-	Size abi.UnpaddedPieceSize
-}
 type HeadChange struct {
 	Type string
 	Val  *types.TipSet

api/docgen/docgen.go

@@ -16,7 +16,6 @@ import (
 	"github.com/google/uuid"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
-	textselector "github.com/ipld/go-ipld-selector-text-lite"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/metrics"
 	"github.com/libp2p/go-libp2p/core/network"
@@ -91,9 +90,6 @@ func init() {
 	addExample(pid)
 	addExample(&pid)
 
-	textSelExample := textselector.Expression("Links/21/Hash/Links/42/Hash")
-	apiSelExample := api.Selector("Links/21/Hash/Links/42/Hash")
-
 	block := blocks.Block(&blocks.BasicBlock{})
 	ExampleValues[reflect.TypeOf(&block).Elem()] = block
 
@@ -124,8 +120,6 @@ func init() {
 	addExample(api.PCHInbound)
 	addExample(time.Minute)
 
-	addExample(&textSelExample)
-	addExample(&apiSelExample)
 	addExample(network.ReachabilityPublic)
 	addExample(build.TestNetworkVersion)
 	allocationId := verifreg.AllocationId(0)

api/types.go

@@ -1,15 +1,13 @@
 package api
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
-	ma "github.com/multiformats/go-multiaddr"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-state-types/abi"
@@ -19,27 +17,6 @@ import (
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 
-type MultiaddrSlice []ma.Multiaddr
-
-func (m *MultiaddrSlice) UnmarshalJSON(raw []byte) (err error) {
-	var temp []string
-	if err := json.Unmarshal(raw, &temp); err != nil {
-		return err
-	}
-
-	res := make([]ma.Multiaddr, len(temp))
-	for i, str := range temp {
-		res[i], err = ma.NewMultiaddr(str)
-		if err != nil {
-			return err
-		}
-	}
-	*m = res
-	return nil
-}
-
-var _ json.Unmarshaler = new(MultiaddrSlice)
-
 type ObjStat struct {
 	Size  uint64
 	Links uint64
@@ -158,13 +135,6 @@ type MessagePrototype struct {
 	ValidNonce bool
 }
 
-// Selector specifies ipld selector string
-//   - if the string starts with '{', it's interpreted as json selector string
-//     see https://ipld.io/specs/selectors/ and https://ipld.io/specs/selectors/fixtures/selector-fixtures-1/
-//   - otherwise the string is interpreted as ipld-selector-text-lite (simple ipld path)
-//     see https://github.com/ipld/go-ipld-selector-text-lite
-type Selector string
-
 type MinerInfo struct {
 	Owner                      address.Address   // Must be an ID-address.
 	Worker                     address.Address   // Must be an ID-address.

build/openrpc/full.json.gz

@@ -23,8 +23,7 @@ import (
 var log = logging.Logger("main")
 
 const (
-	FlagMinerRepo   = "miner-repo"
-	FlagMarketsRepo = "markets-repo"
+	FlagMinerRepo = "miner-repo"
 )
 
 // TODO remove after deprecation period
@@ -77,21 +76,6 @@ func main() {
 		}
 	}
 
-	// adapt the Net* commands to always hit the node running the markets
-	// subsystem, as that is the only one that runs a libp2p node.
-	netCmd := *lcli.NetCmd // make a copy.
-	netCmd.Hidden = true
-	prev := netCmd.Before
-	netCmd.Before = func(c *cli.Context) error {
-		if prev != nil {
-			if err := prev(c); err != nil {
-				return err
-			}
-		}
-		c.App.Metadata["repoType"] = repo.Markets
-		return nil
-	}
-
 	app := &cli.App{
 		Name:                 "lotus-miner",
 		Usage:                "Filecoin decentralized storage network miner",
@@ -129,27 +113,9 @@ func main() {
 				Value:   "~/.lotusminer", // TODO: Consider XDG_DATA_HOME
 				Usage:   fmt.Sprintf("Specify miner repo path. flag(%s) and env(LOTUS_STORAGE_PATH) are DEPRECATION, will REMOVE SOON", FlagMinerRepoDeprecation),
 			},
-			&cli.StringFlag{
-				Name:    FlagMarketsRepo,
-				EnvVars: []string{"LOTUS_MARKETS_PATH"},
-				Hidden:  true,
-			},
-			&cli.BoolFlag{
-				Name:   "call-on-markets",
-				Usage:  "(experimental; may be removed) call this command against a markets node; use only with common commands like net, auth, pprof, etc. whose target may be ambiguous",
-				Hidden: true,
-			},
 			cliutil.FlagVeryVerbose,
 		},
-		Commands: append(local, append(lcli.CommonCommands, &netCmd)...),
-		Before: func(c *cli.Context) error {
-			// this command is explicitly called on markets, inform
-			// common commands by overriding the repoType.
-			if c.Bool("call-on-markets") {
-				c.App.Metadata["repoType"] = repo.Markets
-			}
-			return nil
-		},
+		Commands: append(local, lcli.CommonCommands...),
 		After: func(c *cli.Context) error {
 			if r := recover(); r != nil {
 				// Generate report in LOTUS_PATH and re-raise panic

build/openrpc/gateway.json.gz

@@ -96,7 +96,6 @@ require (
 	github.com/ipld/go-car v0.6.2
 	github.com/ipld/go-car/v2 v2.13.1
 	github.com/ipld/go-ipld-prime v0.21.0
-	github.com/ipld/go-ipld-selector-text-lite v0.0.1
 	github.com/ipni/go-libipni v0.0.8
 	github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
 	github.com/kelseyhightower/envconfig v1.4.0