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

fix: read lane state from chain as well as datastore

Browse Source
This commit is contained in:
Dirk McCormick 2020-09-15 20:06:33 +02:00
parent e2ecc35dff
commit 594ec8855c
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paychmgr/mock_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/crypto"
"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"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
@ -56,7 +57,6 @@ func (sm *mockStateManager) setAccountAddress(a address.Address, lookup address.
func (sm *mockStateManager) setPaychState(a address.Address, actor *types.Actor, state paych.State) { func (sm *mockStateManager) setPaychState(a address.Address, actor *types.Actor, state paych.State) {
sm.lk.Lock() sm.lk.Lock()
defer sm.lk.Unlock() defer sm.lk.Unlock()
sm.paychState[a] = mockPchState{actor, state} sm.paychState[a] = mockPchState{actor, state}
} }

3
paychmgr/paych.go
View File

@ -539,9 +539,6 @@ func (ca *channelAccessor) laneState(state paych.State, ch address.Address) (map
return nil, err return nil, err
} }
// Note: we use a map instead of an array to store laneStates because the
// client sets the lane ID (the index) and potentially they could use a
// very large index.
for _, v := range vouchers { for _, v := range vouchers {
for range v.Voucher.Merges { for range v.Voucher.Merges {
return nil, xerrors.Errorf("paych merges not handled yet") return nil, xerrors.Errorf("paych merges not handled yet")

2
paychmgr/paych_test.go
View File

@ -816,8 +816,6 @@ func testSetupMgrWithChannel(t *testing.T) *testScaffold {
mock := newMockManagerAPI() mock := newMockManagerAPI()
mock.setAccountAddress(fromAcct, from) mock.setAccountAddress(fromAcct, from)
mock.setAccountAddress(toAcct, to) mock.setAccountAddress(toAcct, to)
//mock.setAccountState(fromAcct, account.State{Address: from})
//mock.setAccountState(toAcct, account.State{Address: to})
// Create channel in state // Create channel in state
balance := big.NewInt(20) balance := big.NewInt(20)

16
paychmgr/paychvoucherfunds_test.go
View File

@ -4,13 +4,14 @@ import (
"context" "context"
"testing" "testing"
"github.com/filecoin-project/lotus/chain/actors/builtin/paych"
paychmock "github.com/filecoin-project/lotus/chain/actors/builtin/paych/mock"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"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/actors/builtin" "github.com/filecoin-project/specs-actors/actors/builtin"
"github.com/filecoin-project/specs-actors/actors/builtin/account"
paych "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"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
ds "github.com/ipfs/go-datastore" ds "github.com/ipfs/go-datastore"
@ -36,8 +37,8 @@ func TestPaychAddVoucherAfterAddFunds(t *testing.T) {
defer mock.close() defer mock.close()
// Add the from signing key to the wallet // Add the from signing key to the wallet
mock.setAccountState(fromAcct, account.State{Address: from}) mock.setAccountAddress(fromAcct, from)
mock.setAccountState(toAcct, account.State{Address: to}) mock.setAccountAddress(toAcct, to)
mock.addSigningKey(fromKeyPrivate) mock.addSigningKey(fromKeyPrivate)
mgr, err := newManager(store, mock) mgr, err := newManager(store, mock)
@ -59,12 +60,7 @@ func TestPaychAddVoucherAfterAddFunds(t *testing.T) {
Nonce: 0, Nonce: 0,
Balance: createAmt, Balance: createAmt,
} }
mock.setPaychState(ch, act, paych.State{ mock.setPaychState(ch, act, paychmock.NewMockPayChState(fromAcct, toAcct, abi.ChainEpoch(0), make(map[uint64]paych.LaneState)))
From: fromAcct,
To: toAcct,
SettlingAt: abi.ChainEpoch(0),
MinSettleHeight: abi.ChainEpoch(0),
})
// Wait for create response to be processed by manager // Wait for create response to be processed by manager
_, err = mgr.GetPaychWaitReady(ctx, createMsgCid) _, err = mgr.GetPaychWaitReady(ctx, createMsgCid)