Merge pull request #7220 from filecoin-project/revert/on-deal-exp-cha…

…nges

revert changes to OnDealExpiredOrChanged in #5431 #7201

.circleci/config.yml

@@ -820,11 +820,6 @@ workflows:
           suite: itest-deals_concurrent
           target: "./itests/deals_concurrent_test.go"
 
-      - test:
-          name: test-itest-deals_expiry
-          suite: itest-deals_expiry
-          target: "./itests/deals_expiry_test.go"
-
       - test:
           name: test-itest-deals_offline
           suite: itest-deals_offline
@@ -850,11 +845,6 @@ workflows:
           suite: itest-deals_publish
           target: "./itests/deals_publish_test.go"
 
-      - test:
-          name: test-itest-deals_slash
-          suite: itest-deals_slash
-          target: "./itests/deals_slash_test.go"
-
       - test:
           name: test-itest-deals
           suite: itest-deals

chain/events/events_called.go

@@ -157,7 +157,7 @@ func (e *hcEvents) processHeadChangeEvent(rev, app []*types.TipSet) error {
 			// Apply any queued events and timeouts that were targeted at the
 			// current chain height
 			e.applyWithConfidence(ts, at)
-			e.applyTimeouts(at)
+			e.applyTimeouts(ts)
 		}
 
 		// Update the latest known tipset
@@ -273,8 +273,8 @@ func (e *hcEvents) applyWithConfidence(ts *types.TipSet, height abi.ChainEpoch)
 }
 
 // Apply any timeouts that expire at this height
-func (e *hcEvents) applyTimeouts(at abi.ChainEpoch) {
-	triggers, ok := e.timeouts[at]
+func (e *hcEvents) applyTimeouts(ts *types.TipSet) {
+	triggers, ok := e.timeouts[ts.Height()]
 	if !ok {
 		return // nothing to do
 	}
@@ -288,14 +288,14 @@ func (e *hcEvents) applyTimeouts(at abi.ChainEpoch) {
 			continue
 		}
 
-		timeoutTs, err := e.tsc.get(at - abi.ChainEpoch(trigger.confidence))
+		timeoutTs, err := e.tsc.get(ts.Height() - abi.ChainEpoch(trigger.confidence))
 		if err != nil {
-			log.Errorf("events: applyTimeouts didn't find tipset for event; wanted %d; current %d", at-abi.ChainEpoch(trigger.confidence), at)
+			log.Errorf("events: applyTimeouts didn't find tipset for event; wanted %d; current %d", ts.Height()-abi.ChainEpoch(trigger.confidence), ts.Height())
 		}
 
-		more, err := trigger.handle(nil, nil, timeoutTs, at)
+		more, err := trigger.handle(nil, nil, timeoutTs, ts.Height())
 		if err != nil {
-			log.Errorf("chain trigger (call @H %d, called @ %d) failed: %s", timeoutTs.Height(), at, err)
+			log.Errorf("chain trigger (call @H %d, called @ %d) failed: %s", timeoutTs.Height(), ts.Height(), err)
 			continue // don't revert failed calls
 		}
 

chain/events/events_test.go

@@ -1293,88 +1293,81 @@ func TestStateChangedRevert(t *testing.T) {
 }
 
 func TestStateChangedTimeout(t *testing.T) {
-	timeoutHeight := abi.ChainEpoch(20)
-	confidence := 3
+	fcs := &fakeCS{
+		t: t,
+		h: 1,
 
-	testCases := []struct {
-		name          string
-		checkFn       CheckFunc
-		nilBlocks     []int
-		expectTimeout bool
-	}{{
-		// Verify that the state changed timeout is called at the expected height
-		name: "state changed timeout",
-		checkFn: func(ts *types.TipSet) (d bool, m bool, e error) {
-			return false, true, nil
-		},
-		expectTimeout: true,
-	}, {
-		// Verify that the state changed timeout is called even if the timeout
-		// falls on nil block
-		name: "state changed timeout falls on nil block",
-		checkFn: func(ts *types.TipSet) (d bool, m bool, e error) {
-			return false, true, nil
-		},
-		nilBlocks:     []int{20, 21, 22, 23},
-		expectTimeout: true,
-	}, {
-		// Verify that the state changed timeout is not called if the check
-		// function reports that it's complete
-		name: "no timeout callback if check func reports done",
-		checkFn: func(ts *types.TipSet) (d bool, m bool, e error) {
-			return true, true, nil
-		},
-		expectTimeout: false,
-	}}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
-			fcs := &fakeCS{
-				t: t,
-				h: 1,
-
-				msgs:       map[cid.Cid]fakeMsg{},
-				blkMsgs:    map[cid.Cid]cid.Cid{},
-				tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
-				callNumber: map[string]int{},
-			}
-			require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
-
-			events := NewEvents(context.Background(), fcs)
-
-			// Track whether the callback was called
-			called := false
-
-			// Set up state change tracking that will timeout at the given height
-			err := events.StateChanged(
-				tc.checkFn,
-				func(oldTs, newTs *types.TipSet, data StateChange, curH abi.ChainEpoch) (bool, error) {
-					// Expect the callback to be called at the timeout height with nil data
-					called = true
-					require.Nil(t, data)
-					require.Equal(t, timeoutHeight, newTs.Height())
-					require.Equal(t, timeoutHeight+abi.ChainEpoch(confidence), curH)
-					return false, nil
-				}, func(_ context.Context, ts *types.TipSet) error {
-					t.Fatal("revert on timeout")
-					return nil
-				}, confidence, timeoutHeight, func(oldTs, newTs *types.TipSet) (bool, StateChange, error) {
-					return false, nil, nil
-				})
-
-			require.NoError(t, err)
-
-			// Advance to timeout height
-			fcs.advance(0, int(timeoutHeight)+1, nil)
-			require.False(t, called)
-
-			// Advance past timeout height
-			fcs.advance(0, 5, nil, tc.nilBlocks...)
-			require.Equal(t, tc.expectTimeout, called)
-			called = false
-		})
+		msgs:       map[cid.Cid]fakeMsg{},
+		blkMsgs:    map[cid.Cid]cid.Cid{},
+		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
+		callNumber: map[string]int{},
 	}
+	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
+
+	events := NewEvents(context.Background(), fcs)
+
+	called := false
+
+	err := events.StateChanged(func(ts *types.TipSet) (d bool, m bool, e error) {
+		return false, true, nil
+	}, func(oldTs, newTs *types.TipSet, data StateChange, curH abi.ChainEpoch) (bool, error) {
+		called = true
+		require.Nil(t, data)
+		require.Equal(t, abi.ChainEpoch(20), newTs.Height())
+		require.Equal(t, abi.ChainEpoch(23), curH)
+		return false, nil
+	}, func(_ context.Context, ts *types.TipSet) error {
+		t.Fatal("revert on timeout")
+		return nil
+	}, 3, 20, func(oldTs, newTs *types.TipSet) (bool, StateChange, error) {
+		return false, nil, nil
+	})
+
+	require.NoError(t, err)
+
+	fcs.advance(0, 21, nil)
+	require.False(t, called)
+
+	fcs.advance(0, 5, nil)
+	require.True(t, called)
+	called = false
+
+	// with check func reporting done
+
+	fcs = &fakeCS{
+		t: t,
+		h: 1,
+
+		msgs:       map[cid.Cid]fakeMsg{},
+		blkMsgs:    map[cid.Cid]cid.Cid{},
+		callNumber: map[string]int{},
+		tsc:        newTSCache(2*build.ForkLengthThreshold, nil),
+	}
+	require.NoError(t, fcs.tsc.add(fcs.makeTs(t, nil, 1, dummyCid)))
+
+	events = NewEvents(context.Background(), fcs)
+
+	err = events.StateChanged(func(ts *types.TipSet) (d bool, m bool, e error) {
+		return true, true, nil
+	}, func(oldTs, newTs *types.TipSet, data StateChange, curH abi.ChainEpoch) (bool, error) {
+		called = true
+		require.Nil(t, data)
+		require.Equal(t, abi.ChainEpoch(20), newTs.Height())
+		require.Equal(t, abi.ChainEpoch(23), curH)
+		return false, nil
+	}, func(_ context.Context, ts *types.TipSet) error {
+		t.Fatal("revert on timeout")
+		return nil
+	}, 3, 20, func(oldTs, newTs *types.TipSet) (bool, StateChange, error) {
+		return false, nil, nil
+	})
+	require.NoError(t, err)
+
+	fcs.advance(0, 21, nil)
+	require.False(t, called)
+
+	fcs.advance(0, 5, nil)
+	require.False(t, called)
 }
 
 func TestCalledMultiplePerEpoch(t *testing.T) {

go.mod

@@ -36,7 +36,7 @@ require (
 	github.com/filecoin-project/go-data-transfer v1.7.6
 	github.com/filecoin-project/go-fil-commcid v0.1.0
 	github.com/filecoin-project/go-fil-commp-hashhash v0.1.0
-	github.com/filecoin-project/go-fil-markets v1.9.0
+	github.com/filecoin-project/go-fil-markets v1.8.1
 	github.com/filecoin-project/go-jsonrpc v0.1.4-0.20210217175800-45ea43ac2bec
 	github.com/filecoin-project/go-multistore v0.0.3
 	github.com/filecoin-project/go-padreader v0.0.0-20210723183308-812a16dc01b1

go.sum

@@ -291,8 +291,8 @@ github.com/filecoin-project/go-fil-commcid v0.1.0/go.mod h1:Eaox7Hvus1JgPrL5+M3+
 github.com/filecoin-project/go-fil-commp-hashhash v0.1.0 h1:imrrpZWEHRnNqqv0tN7LXep5bFEVOVmQWHJvl2mgsGo=
 github.com/filecoin-project/go-fil-commp-hashhash v0.1.0/go.mod h1:73S8WSEWh9vr0fDJVnKADhfIv/d6dCbAGaAGWbdJEI8=
 github.com/filecoin-project/go-fil-markets v1.0.5-0.20201113164554-c5eba40d5335/go.mod h1:AJySOJC00JRWEZzRG2KsfUnqEf5ITXxeX09BE9N4f9c=
-github.com/filecoin-project/go-fil-markets v1.9.0 h1:atoORQmjN1SEjB4RKj3uvPCqL9Jcs2RZ1GHKefstkxw=
-github.com/filecoin-project/go-fil-markets v1.9.0/go.mod h1:PIPyOhoDLWT5NcciJQeK6Hes7MIeczGLNWVO/2Vy0a4=
+github.com/filecoin-project/go-fil-markets v1.8.1 h1:nNJB5EIp5c6yo/z51DloVaL7T24SslCoxSDOXwNQr9k=
+github.com/filecoin-project/go-fil-markets v1.8.1/go.mod h1:PIPyOhoDLWT5NcciJQeK6Hes7MIeczGLNWVO/2Vy0a4=
 github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM=
 github.com/filecoin-project/go-hamt-ipld v0.1.5/go.mod h1:6Is+ONR5Cd5R6XZoCse1CWaXZc0Hdb/JeX+EQCQzX24=
 github.com/filecoin-project/go-hamt-ipld/v2 v2.0.0 h1:b3UDemBYN2HNfk3KOXNuxgTTxlWi3xVvbQP0IT38fvM=