Fix merge problems

packages/tangle/timemanager.go

@@ -83,6 +83,7 @@ func (t *TimeManager) Start() {
 func (t *TimeManager) Setup() {
 	t.tangle.ConfirmationOracle.Events().MessageConfirmed.Attach(event.NewClosure(func(event *MessageConfirmedEvent) {
 		t.updateTime(event.Message)
+		t.updateSyncedState()
 	}))
 	t.Start()
 }
@@ -167,16 +168,14 @@ func (t *TimeManager) updateTime(message *Message) {
 	t.lastConfirmedMutex.Lock()
 	defer t.lastConfirmedMutex.Unlock()
 
-		if t.lastConfirmedMessage.MessageTime.After(message.IssuingTime()) {
-			return
-		}
-		t.lastConfirmedMessage = LastConfirmedMessage{
-			MessageID:     message.ID(),
-			MessageTime:   message.IssuingTime(),
-			ConfirmedTime: time.Now(),
-		}
-	})
-	t.updateSyncedState()
+	if t.lastConfirmedMessage.MessageTime.After(message.IssuingTime()) {
+		return
+	}
+	t.lastConfirmedMessage = LastConfirmedMessage{
+		MessageID:     message.ID(),
+		MessageTime:   message.IssuingTime(),
+		ConfirmedTime: time.Now(),
+	}
 }
 
 // RCTT return relative confirmed tangle time.

packages/tangle/tipmanager_test.go

@@ -31,20 +31,21 @@ func TestTipManager_DataMessageTips(t *testing.T) {
 		assert.Len(t, parents, 1)
 		assert.Contains(t, parents, EmptyMessageID)
 	}
-
+	fmt.Println("send genesis")
 	// without any count -> 1 tip, in this case genesis
 	{
 		parents, err := tipManager.Tips(nil, 0)
 		assert.NoError(t, err)
 		assert.Len(t, parents, 1)
 		assert.Contains(t, parents, EmptyMessageID)
 	}
-
+	fmt.Println("send msg1")
 	// Message 1
 	{
 		messages["1"] = createAndStoreParentsDataMessageInMasterBranch(tangle, NewMessageIDs(EmptyMessageID), NewMessageIDs())
 		tipManager.AddTip(messages["1"])
 		tangle.TimeManager.updateTime(messages["1"])
+		tangle.TimeManager.updateSyncedState()
 
 		assert.Equal(t, 1, tipManager.TipCount())
 		assert.Contains(t, tipManager.tips.Keys(), messages["1"].ID())
@@ -54,7 +55,7 @@ func TestTipManager_DataMessageTips(t *testing.T) {
 		assert.Len(t, parents, 1)
 		assert.Contains(t, parents, messages["1"].ID())
 	}
-
+	fmt.Println("send msg2")
 	// Message 2
 	{
 		messages["2"] = createAndStoreParentsDataMessageInMasterBranch(tangle, NewMessageIDs(EmptyMessageID), NewMessageIDs())
@@ -68,7 +69,7 @@ func TestTipManager_DataMessageTips(t *testing.T) {
 		assert.Len(t, parents, 2)
 		assert.Contains(t, parents, messages["1"].ID(), messages["2"].ID())
 	}
-
+	fmt.Println("send msg3")
 	// Message 3
 	{
 		messages["3"] = createAndStoreParentsDataMessageInMasterBranch(tangle, NewMessageIDs(messages["1"].ID(), messages["2"].ID()), NewMessageIDs())
@@ -82,7 +83,7 @@ func TestTipManager_DataMessageTips(t *testing.T) {
 		assert.Len(t, parents, 1)
 		assert.Contains(t, parents, messages["3"].ID())
 	}
-
+	fmt.Println("send msg3")
 	// Add Message 4-8
 	{
 		tips := NewMessageIDs()
@@ -96,6 +97,7 @@ func TestTipManager_DataMessageTips(t *testing.T) {
 			assert.Equalf(t, count+2, tipManager.TipCount(), "TipCount does not match after adding Message %d", n)
 			assert.ElementsMatchf(t, tipManager.tips.Keys(), tips.Slice(), "Elements in strongTips do not match after adding Message %d", n)
 			assert.Contains(t, tipManager.tips.Keys(), messages["3"].ID())
+			fmt.Println("send msg", n)
 		}
 	}
 
@@ -106,18 +108,21 @@ func TestTipManager_DataMessageTips(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Len(t, parents, 4)
 	}
+	fmt.Println("select tip1")
 	// Tips(8) -> 6
 	{
 		parents, err := tipManager.Tips(nil, 8)
 		assert.NoError(t, err)
 		assert.Len(t, parents, 6)
 	}
+	fmt.Println("select tip2")
 	// Tips(0) -> 1
 	{
 		parents, err := tipManager.Tips(nil, 0)
 		assert.NoError(t, err)
 		assert.Len(t, parents, 1)
 	}
+	fmt.Println("select tip3")
 }
 
 // TODO: FIX
@@ -439,6 +444,7 @@ func TestTipManager_TimeSinceConfirmation_Unconfirmed(t *testing.T) {
 
 	tangle.ConfirmationOracle = &MockConfirmationOracleTipManagerTest{confirmedMessageIDs: confirmedMessageIDs, confirmedMarkers: confirmedMarkers}
 	tangle.TimeManager.updateTime(testFramework.Message("Marker-2/3"))
+	tangle.TimeManager.updateSyncedState()
 
 	// Even without any confirmations, it should be possible to attach to genesis.
 	assert.True(t, tipManager.isPastConeTimestampCorrect(EmptyMessageID))
@@ -501,6 +507,7 @@ func TestTipManager_TimeSinceConfirmation_Confirmed(t *testing.T) {
 
 	tangle.ConfirmationOracle = &MockConfirmationOracleTipManagerTest{confirmedMessageIDs: confirmedMessageIDs, confirmedMarkers: confirmedMarkers}
 	tangle.TimeManager.updateTime(testFramework.Message("Marker-2/3"))
+	tangle.TimeManager.updateSyncedState()
 
 	// Even without any confirmations, it should be possible to attach to genesis.
 	assert.True(t, tipManager.isPastConeTimestampCorrect(EmptyMessageID))
@@ -570,7 +577,7 @@ func createTestTangleTSC(t *testing.T, testFramework *MessageTestFramework) {
 
 		// issue message for test case #16
 		testFramework.CreateMessage("0/1-postTSC-direct_0", WithStrongParents("Marker-0/1"))
-		testFramework.IssueMessages("0/1-postTSC-direct_0").WaitMessagesBooked()
+		testFramework.IssueMessages("0/1-postTSC-direct_0").WaitUntilAllTasksProcessed()
 
 		checkMarkers(t, testFramework, map[string]*markers.Markers{
 			"Marker-0/1":    markers.NewMarkers(markers.NewMarker(0, 1)),
@@ -772,7 +779,7 @@ func createTestTangleTSC(t *testing.T, testFramework *MessageTestFramework) {
 		lastMsgAlias = issueMessages(testFramework, "0/1-postTSCSeq6", 6, []string{"0/1-preTSCSeq2_2"}, 0)
 		testFramework.PreventNewMarkers(false)
 		testFramework.CreateMessage("Marker-6/2", WithStrongParents(lastMsgAlias))
-		testFramework.IssueMessages("Marker-6/2").WaitMessagesBooked()
+		testFramework.IssueMessages("Marker-6/2").WaitUntilAllTasksProcessed()
 		testFramework.PreventNewMarkers(true)
 		_ = issueMessages(testFramework, "6/2", 5, []string{"Marker-6/2"}, 0)
 		testFramework.PreventNewMarkers(false)

packages/tangle/utils_test.go

@@ -23,14 +23,26 @@ func TestUtils_AllTransactionsApprovedByMessages(t *testing.T) {
 	mtf := NewMessageTestFramework(tangle, WithGenesisOutput("Genesis1", 5), WithGenesisOutput("Genesis2", 8))
 
 	mtf.CreateMessage("Message1", WithStrongParents("Genesis"))
+	mtf.IssueMessages("Message1").WaitUntilAllTasksProcessed()
+
 	mtf.CreateMessage("Message2", WithInputs("Genesis1"), WithOutput("A", 5), WithStrongParents("Message1"))
+	mtf.IssueMessages("Message2").WaitUntilAllTasksProcessed()
+
 	mtf.CreateMessage("Message3", WithStrongParents("Message2"))
+	mtf.IssueMessages("Message3").WaitUntilAllTasksProcessed()
+
 	mtf.CreateMessage("Message4", WithStrongParents("Genesis"))
+	mtf.IssueMessages("Message4").WaitUntilAllTasksProcessed()
+
 	mtf.CreateMessage("Message5", WithInputs("Genesis2"), WithOutput("B", 4), WithOutput("C", 4), WithStrongParents("Message4"))
+	mtf.IssueMessages("Message5").WaitUntilAllTasksProcessed()
+
 	mtf.CreateMessage("Message6", WithStrongParents("Message5"))
+	mtf.IssueMessages("Message6").WaitUntilAllTasksProcessed()
+
 	mtf.CreateMessage("Message7", WithInputs("A", "B", "C"), WithOutput("D", 13), WithStrongParents("Message3", "Message6"))
 
-	mtf.IssueMessages("Message1", "Message2", "Message3", "Message4", "Message5", "Message6", "Message7").WaitUntilAllTasksProcessed()
+	mtf.IssueMessages("Message7").WaitUntilAllTasksProcessed()
 
 	for messageAlias, expectedMarkers := range map[string]*markers.Markers{
 		"Message1": markers.NewMarkers(markers.NewMarker(0, 1)),