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

fix tests to use v2 types

Browse Source
This commit is contained in:
Steven Allen 2020-10-05 13:27:34 -07:00
parent f8b2022f82
commit 9621dbb4f1
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
paychmgr/paych_test.go
View File

@ -15,8 +15,8 @@ import (
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/crypto"
"github.com/filecoin-project/specs-actors/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
paych0 "github.com/filecoin-project/specs-actors/actors/builtin/paych"
tutils "github.com/filecoin-project/specs-actors/support/testing" tutils "github.com/filecoin-project/specs-actors/support/testing"
paych2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/paych"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/actors/builtin/paych" "github.com/filecoin-project/lotus/chain/actors/builtin/paych"
@ -237,7 +237,7 @@ func TestCreateVoucher(t *testing.T) {
// Create a voucher in lane 1 // Create a voucher in lane 1
voucherLane1Amt := big.NewInt(5) voucherLane1Amt := big.NewInt(5)
voucher := paych0.SignedVoucher{ voucher := paych2.SignedVoucher{
Lane: 1, Lane: 1,
Amount: voucherLane1Amt, Amount: voucherLane1Amt,
} }
@ -252,7 +252,7 @@ func TestCreateVoucher(t *testing.T) {
// Create a voucher in lane 1 again, with a higher amount // Create a voucher in lane 1 again, with a higher amount
voucherLane1Amt = big.NewInt(8) voucherLane1Amt = big.NewInt(8)
voucher = paych0.SignedVoucher{ voucher = paych2.SignedVoucher{
Lane: 1, Lane: 1,
Amount: voucherLane1Amt, Amount: voucherLane1Amt,
} }
@ -267,7 +267,7 @@ func TestCreateVoucher(t *testing.T) {
// Create a voucher in lane 2 that covers all the remaining funds // Create a voucher in lane 2 that covers all the remaining funds
// in the channel // in the channel
voucherLane2Amt := big.Sub(s.amt, voucherLane1Amt) voucherLane2Amt := big.Sub(s.amt, voucherLane1Amt)
voucher = paych0.SignedVoucher{ voucher = paych2.SignedVoucher{
Lane: 2, Lane: 2,
Amount: voucherLane2Amt, Amount: voucherLane2Amt,
} }
@ -281,7 +281,7 @@ func TestCreateVoucher(t *testing.T) {
// Create a voucher in lane 2 that exceeds the remaining funds in the // Create a voucher in lane 2 that exceeds the remaining funds in the
// channel // channel
voucherLane2Amt = big.Add(voucherLane2Amt, big.NewInt(1)) voucherLane2Amt = big.Add(voucherLane2Amt, big.NewInt(1))
voucher = paych0.SignedVoucher{ voucher = paych2.SignedVoucher{
Lane: 2, Lane: 2,
Amount: voucherLane2Amt, Amount: voucherLane2Amt,
} }
@ -619,7 +619,7 @@ func TestCheckSpendable(t *testing.T) {
// Check that the secret was passed through correctly // Check that the secret was passed through correctly
lastCall := s.mock.getLastCall() lastCall := s.mock.getLastCall()
var p paych0.UpdateChannelStateParams var p paych2.UpdateChannelStateParams
err = p.UnmarshalCBOR(bytes.NewReader(lastCall.Params)) err = p.UnmarshalCBOR(bytes.NewReader(lastCall.Params))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, secret, p.Secret) require.Equal(t, secret, p.Secret)
@ -673,7 +673,7 @@ func TestSubmitVoucher(t *testing.T) {
// Check that the secret was passed through correctly // Check that the secret was passed through correctly
msg := s.mock.pushedMessages(submitCid) msg := s.mock.pushedMessages(submitCid)
var p paych0.UpdateChannelStateParams var p paych2.UpdateChannelStateParams
err = p.UnmarshalCBOR(bytes.NewReader(msg.Message.Params)) err = p.UnmarshalCBOR(bytes.NewReader(msg.Message.Params))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, secret, p.Secret) require.Equal(t, secret, p.Secret)
@ -687,7 +687,7 @@ func TestSubmitVoucher(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
msg = s.mock.pushedMessages(submitCid) msg = s.mock.pushedMessages(submitCid)
var p3 paych0.UpdateChannelStateParams var p3 paych2.UpdateChannelStateParams
err = p3.UnmarshalCBOR(bytes.NewReader(msg.Message.Params)) err = p3.UnmarshalCBOR(bytes.NewReader(msg.Message.Params))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, secret3, p3.Secret) require.Equal(t, secret3, p3.Secret)
@ -773,8 +773,8 @@ func testGenerateKeyPair(t *testing.T) ([]byte, []byte) {
return priv, pub return priv, pub
} }
func createTestVoucher(t *testing.T, ch address.Address, voucherLane uint64, nonce uint64, voucherAmount big.Int, key []byte) *paych0.SignedVoucher { func createTestVoucher(t *testing.T, ch address.Address, voucherLane uint64, nonce uint64, voucherAmount big.Int, key []byte) *paych2.SignedVoucher {
sv := &paych0.SignedVoucher{ sv := &paych2.SignedVoucher{
ChannelAddr: ch, ChannelAddr: ch,
Lane: voucherLane, Lane: voucherLane,
Nonce: nonce, Nonce: nonce,
@ -789,13 +789,13 @@ func createTestVoucher(t *testing.T, ch address.Address, voucherLane uint64, non
return sv return sv
} }
func createTestVoucherWithExtra(t *testing.T, ch address.Address, voucherLane uint64, nonce uint64, voucherAmount big.Int, key []byte) *paych0.SignedVoucher { func createTestVoucherWithExtra(t *testing.T, ch address.Address, voucherLane uint64, nonce uint64, voucherAmount big.Int, key []byte) *paych2.SignedVoucher {
sv := &paych0.SignedVoucher{ sv := &paych2.SignedVoucher{
ChannelAddr: ch, ChannelAddr: ch,
Lane: voucherLane, Lane: voucherLane,
Nonce: nonce, Nonce: nonce,
Amount: voucherAmount, Amount: voucherAmount,
Extra: &paych0.ModVerifyParams{ Extra: &paych2.ModVerifyParams{
Actor: tutils.NewActorAddr(t, "act"), Actor: tutils.NewActorAddr(t, "act"),
}, },
} }
@ -813,13 +813,13 @@ type mockBestSpendableAPI struct {
mgr *Manager mgr *Manager
} }
func (m *mockBestSpendableAPI) PaychVoucherList(ctx context.Context, ch address.Address) ([]*paych0.SignedVoucher, error) { func (m *mockBestSpendableAPI) PaychVoucherList(ctx context.Context, ch address.Address) ([]*paych2.SignedVoucher, error) {
vi, err := m.mgr.ListVouchers(ctx, ch) vi, err := m.mgr.ListVouchers(ctx, ch)
if err != nil { if err != nil {
return nil, err return nil, err
} }
out := make([]*paych0.SignedVoucher, len(vi)) out := make([]*paych2.SignedVoucher, len(vi))
for k, v := range vi { for k, v := range vi {
out[k] = v.Voucher out[k] = v.Voucher
} }
@ -827,7 +827,7 @@ func (m *mockBestSpendableAPI) PaychVoucherList(ctx context.Context, ch address.
return out, nil return out, nil
} }
func (m *mockBestSpendableAPI) PaychVoucherCheckSpendable(ctx context.Context, ch address.Address, voucher *paych0.SignedVoucher, secret []byte, proof []byte) (bool, error) { func (m *mockBestSpendableAPI) PaychVoucherCheckSpendable(ctx context.Context, ch address.Address, voucher *paych2.SignedVoucher, secret []byte, proof []byte) (bool, error) {
return m.mgr.CheckVoucherSpendable(ctx, ch, voucher, secret, proof) return m.mgr.CheckVoucherSpendable(ctx, ch, voucher, secret, proof)
} }

4
paychmgr/paychget_test.go
View File

@ -16,7 +16,7 @@ import (
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/specs-actors/v2/actors/builtin" "github.com/filecoin-project/specs-actors/v2/actors/builtin"
init_ "github.com/filecoin-project/specs-actors/v2/actors/builtin/init" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
tutils "github.com/filecoin-project/specs-actors/v2/support/testing" tutils "github.com/filecoin-project/specs-actors/v2/support/testing"
lotusinit "github.com/filecoin-project/lotus/chain/actors/builtin/init" lotusinit "github.com/filecoin-project/lotus/chain/actors/builtin/init"
@ -26,7 +26,7 @@ import (
) )
func testChannelResponse(t *testing.T, ch address.Address) types.MessageReceipt { func testChannelResponse(t *testing.T, ch address.Address) types.MessageReceipt {
createChannelRet := init_.ExecReturn{ createChannelRet := init2.ExecReturn{
IDAddress: ch, IDAddress: ch,
RobustAddress: ch, RobustAddress: ch,
} }

2
paychmgr/simple.go
View File

@ -13,7 +13,7 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
init2 "github.com/filecoin-project/specs-actors/actors/builtin/init" init2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/init"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"