diff --git a/dapps/valuetransfers/packages/tangle/tangle.go b/dapps/valuetransfers/packages/tangle/tangle.go index 0f147e50586b060cd6995e777f9c6143cc3d9aba..c04b0974ecc1b3419518007906291a066ad73641 100644 --- a/dapps/valuetransfers/packages/tangle/tangle.go +++ b/dapps/valuetransfers/packages/tangle/tangle.go @@ -234,7 +234,7 @@ func (tangle *Tangle) Fork(transactionID transaction.ID, conflictingInputs []tra } // trigger events + set result - tangle.Events.Fork.Trigger(cachedTransaction, cachedTransactionMetadata) + tangle.Events.Fork.Trigger(cachedTransaction, cachedTransactionMetadata, cachedTargetBranch, conflictingInputs) forked = true return diff --git a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go index 26888ee970dee1493fab2cb17b2601c1a8a2356f..9a391f20e24fa9b8ebbc3709b5a2377a0dfbd20b 100644 --- a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go +++ b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go @@ -164,7 +164,7 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) { Finalized: tests.True(), } } - err = tests.AwaitTransactionInclusionState(n.Peers(), awaitFinalization, 4*time.Minute) + err = tests.AwaitTransactionInclusionState(n.Peers(), awaitFinalization, 2*time.Minute) assert.NoError(t, err) // now all transactions must be finalized and at most one must be confirmed