Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update venus & adjust interface parameters #306

Merged
merged 1 commit into from
Mar 23, 2023
Merged

chore: update venus & adjust interface parameters #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions cli/retrieval-deals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"time"

"github.com/filecoin-project/go-fil-markets/retrievalmarket"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/venus/venus-shared/types/market"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/urfave/cli/v2"
Expand Down Expand Up @@ -42,9 +41,9 @@ var retrievalDealsListCmd = &cli.Command{
Name: "receiver",
Usage: "client peer id",
},
&cli.Int64Flag{
Name: "deal-id",
Usage: "deal id",
&cli.StringFlag{
Name: "data-cid",
Usage: "deal root cid",
},
&cli.Uint64Flag{
Name: "status",
Expand Down Expand Up @@ -72,8 +71,8 @@ part statuses:
defer closer()

params := market.RetrievalDealQueryParams{
Receiver: cctx.String("receiver"),
DealID: abi.DealID(cctx.Int64("deal-id")),
Receiver: cctx.String("receiver"),
PayloadCID: cctx.String("data-cid"),
Page: market.Page{
Offset: cctx.Int(offsetFlag.Name),
Limit: cctx.Int(limitFlag.Name),
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/filecoin-project/go-statestore v0.2.0
github.com/filecoin-project/specs-actors/v2 v2.3.6
github.com/filecoin-project/specs-actors/v7 v7.0.1
github.com/filecoin-project/venus v1.10.2-0.20230321024212-c947977469d1
github.com/filecoin-project/venus v1.10.2-0.20230323081631-db00ea0b125d
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e
github.com/filecoin-project/venus-messager v1.10.2-0.20230309071456-7cd8d49c6e9a
github.com/golang/mock v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893
github.com/filecoin-project/storetheindex v0.4.30-0.20221114113647-683091f8e893/go.mod h1:S7590oDimBvXMUtzWsBXoshu9HtYKwtXl47zAK9rcP8=
github.com/filecoin-project/test-vectors/schema v0.0.5/go.mod h1:iQ9QXLpYWL3m7warwvK1JC/pTri8mnfEmKygNDqqY6E=
github.com/filecoin-project/venus v1.2.4/go.mod h1:hJULXHGAnWuq5S5KRtPkwbT8DqgM9II7NwyNU7t59D0=
github.com/filecoin-project/venus v1.10.2-0.20230321024212-c947977469d1 h1:7oOpGYCy47O5EG4yAnOZpnr6dHMiqRCOGjf8VVOLmDA=
github.com/filecoin-project/venus v1.10.2-0.20230321024212-c947977469d1/go.mod h1:d6XlyUBZd+SHydYimTTkUr3O5rjYOHQTsydI4Nxy6U8=
github.com/filecoin-project/venus v1.10.2-0.20230323081631-db00ea0b125d h1:dE+gdFiIPCgW089ER7ztGsDdkgJWbUU3t/mgabrj4gs=
github.com/filecoin-project/venus v1.10.2-0.20230323081631-db00ea0b125d/go.mod h1:d6XlyUBZd+SHydYimTTkUr3O5rjYOHQTsydI4Nxy6U8=
github.com/filecoin-project/venus-auth v1.3.2/go.mod h1:m5Jog2GYxztwP7w3m/iJdv/V1/bTcAVU9rm/CbhxRQU=
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e h1:Bxpt1AzPeNxmUnFT2Y8rpabr9x0wIC0Q87DeRmjL2co=
github.com/filecoin-project/venus-auth v1.10.2-0.20230308100319-913815325d5e/go.mod h1:aBfIfNxQkdcY8Rk5wrQn9qRtJpH4RTDdc10Ac+ferzs=
Expand Down
2 changes: 1 addition & 1 deletion models/badger/retrieval_deal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (r retrievalDealRepo) ListDeals(ctx context.Context, params *types.Retrieva
if len(params.Receiver) > 0 && deal.Receiver.Pretty() != params.Receiver {
return false, nil
}
if params.DealID > 0 && deal.ID != retrievalmarket.DealID(params.DealID) {
if len(params.PayloadCID) > 0 && deal.PayloadCID.String() != params.PayloadCID {
return false, nil
}
if params.Status != nil && deal.Status != retrievalmarket.DealStatus(*params.Status) {
Expand Down
4 changes: 2 additions & 2 deletions models/badger/retrieval_deal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ func TestHasDeal(t *testing.T) {
func TestListDeals(t *testing.T) {
ctx, r, dealCases := prepareRetrievalDealTest(t)

var peerID peer.ID
testutil.Provide(t, &peerID)
peerID, err := peer.Decode("12D3KooWCj14HxjJZch7ANeVzmfhPBgZm492euXzoCHiBBEtRsSn")
assert.NoError(t, err)
peers := []peer.ID{dealCases[0].Receiver, peerID}
status := []retrievalmarket.DealStatus{
retrievalmarket.DealStatusCancelled,
Expand Down
4 changes: 2 additions & 2 deletions models/mysql/retrieval_deal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ func (rdr *retrievalDealRepo) ListDeals(ctx context.Context, params *types.Retri
if len(params.Receiver) > 0 {
query.Where("receiver = ?", params.Receiver)
}
if params.DealID > 0 {
query.Where("cdp_proposal_id = ?", params.DealID)
if len(params.PayloadCID) > 0 {
query.Where("cdp_payload_cid = ?", params.PayloadCID)
}
if params.Status != nil {
query.Where("status = ?", params.Status)
Expand Down
10 changes: 5 additions & 5 deletions models/mysql/retrieval_deal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/DATA-DOG/go-sqlmock"
datatransfer "github.com/filecoin-project/go-data-transfer"
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/venus-market/v2/models/repo"
"github.com/filecoin-project/venus-messager/models/mtypes"
"github.com/filecoin-project/venus/venus-shared/testutil"
types "github.com/filecoin-project/venus/venus-shared/types/market"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -150,7 +150,7 @@ func TestListRetrievalDeals(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, 1, len(res))

rows = mock.NewRows([]string{"cdp_proposal_id", "cdp_payload_cid", "cdp_selector", "cdp_piece_cid", "cdp_price_perbyte", "cdp_payment_interval", "cdp_payment_interval_increase", "cdp_unseal_price", "store_id", "ci_initiator", "ci_responder", "ci_channel_id", "sel_proposal_cid", "status", "receiver", "total_sent", "funds_received", "message", "current_interval", "legacy_protocol", "created_at", "updated_at"})
rows = mock.NewRows([]string{"cdp_payload_cid", "cdp_payload_cid", "cdp_selector", "cdp_piece_cid", "cdp_price_perbyte", "cdp_payment_interval", "cdp_payment_interval_increase", "cdp_unseal_price", "store_id", "ci_initiator", "ci_responder", "ci_channel_id", "sel_proposal_cid", "status", "receiver", "total_sent", "funds_received", "message", "current_interval", "legacy_protocol", "created_at", "updated_at"})
mock.ExpectQuery(regexp.QuoteMeta("SELECT * FROM `retrieval_deals` LIMIT 10 OFFSET 10")).WillReturnRows(rows)
res, err = r.RetrievalDealRepo().ListDeals(ctx, &types.RetrievalDealQueryParams{Page: types.Page{Offset: 10, Limit: 10}})
assert.Nil(t, err)
Expand All @@ -166,11 +166,11 @@ func TestListRetrievalDeals(t *testing.T) {
assert.Equal(t, 1, len(res))

// test deal id
dealID := dbRetrievalDealCase.ID
payloadCID := testutil.CidProvider(32)(t)
rows, err = getFullRows(dbRetrievalDealCase)
assert.NoError(t, err)
mock.ExpectQuery(regexp.QuoteMeta("SELECT * FROM `retrieval_deals` WHERE cdp_proposal_id = ?")).WithArgs(dealID).WillReturnRows(rows)
res, err = r.RetrievalDealRepo().ListDeals(ctx, &types.RetrievalDealQueryParams{DealID: abi.DealID(dealID)})
mock.ExpectQuery(regexp.QuoteMeta("SELECT * FROM `retrieval_deals` WHERE cdp_payload_cid = ?")).WithArgs(payloadCID.String()).WillReturnRows(rows)
res, err = r.RetrievalDealRepo().ListDeals(ctx, &types.RetrievalDealQueryParams{PayloadCID: payloadCID.String()})
assert.Nil(t, err)
assert.Equal(t, 1, len(res))

Expand Down