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

fix: dont register state change if deal is not present in from and to states

Browse Source
This commit is contained in:
Dirk McCormick 2020-06-30 14:33:48 -04:00 committed by Łukasz Magiera
parent 1fd1c2edbd
commit a3abff768c
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chain/events/state/predicates.go
View File

@ -117,6 +117,8 @@ func (sp *StatePredicates) DealStateChangedForIDs(dealIds []abi.DealID) DiffDeal
for _, dealID := range dealIds { for _, dealID := range dealIds {
var oldDealPtr, newDealPtr *market.DealState var oldDealPtr, newDealPtr *market.DealState
var oldDeal, newDeal market.DealState var oldDeal, newDeal market.DealState
// If the deal has been removed, we just set it to nil
err := oldDealStateRoot.Get(ctx, uint64(dealID), &oldDeal) err := oldDealStateRoot.Get(ctx, uint64(dealID), &oldDeal)
if err == nil { if err == nil {
oldDealPtr = &oldDeal oldDealPtr = &oldDeal
@ -129,7 +131,8 @@ func (sp *StatePredicates) DealStateChangedForIDs(dealIds []abi.DealID) DiffDeal
} else if _, ok := err.(*amt.ErrNotFound); !ok { } else if _, ok := err.(*amt.ErrNotFound); !ok {
return false, nil, err return false, nil, err
} }
if oldDealPtr == nil || newDealPtr == nil || oldDeal != newDeal {
if oldDeal != newDeal {
changedDeals[dealID] = DealStateChange{oldDealPtr, newDealPtr} changedDeals[dealID] = DealStateChange{oldDealPtr, newDealPtr}
} }
} }

14
chain/events/state/predicates_test.go
View File

@ -128,23 +128,11 @@ func TestPredicates(t *testing.T) {
} }
// Diff with non-existent deal. // Diff with non-existent deal.
// Note that for non existent deals we expect a change with
// From and To set to nil. This is to ensure that if a deal expires and is
// removed from state we will still find out about the change.
noDeal := []abi.DealID{3} noDeal := []abi.DealID{3}
diffNoDealFn := preds.OnStorageMarketActorChanged(preds.OnDealStateChanged(preds.DealStateChangedForIDs(noDeal))) diffNoDealFn := preds.OnStorageMarketActorChanged(preds.OnDealStateChanged(preds.DealStateChangedForIDs(noDeal)))
changed, val, err = diffNoDealFn(ctx, oldState, newState) changed, val, err = diffNoDealFn(ctx, oldState, newState)
require.NoError(t, err) require.NoError(t, err)
require.True(t, changed) require.False(t, changed)
changedDeals, ok = val.(ChangedDeals)
require.True(t, ok)
require.Len(t, changedDeals, 1)
require.Contains(t, changedDeals, noDeal[0])
deal1 = changedDeals[abi.DealID(1)]
if deal1.From != nil || deal1.To != nil {
t.Fatal("Expected both from and to to be nil")
}
// Test that OnActorStateChanged does not call the callback if the state has not changed // Test that OnActorStateChanged does not call the callback if the state has not changed
mockAddr, err := address.NewFromString("t01") mockAddr, err := address.NewFromString("t01")