From 3360fd668055a9a532a55efee9ab1de3610662b7 Mon Sep 17 00:00:00 2001
From: Luca Moser <moser.luca@gmail.com>
Date: Tue, 16 Jun 2020 12:17:59 +0200
Subject: [PATCH] fix panic when tangle.Fork() is called
---
dapps/valuetransfers/packages/tangle/tangle.go | 2 +-
.../tester/tests/consensus/consensus_conflicts_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dapps/valuetransfers/packages/tangle/tangle.go b/dapps/valuetransfers/packages/tangle/tangle.go
index 0f147e50..c04b0974 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 26888ee9..9a391f20 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
--
GitLab