From af91b69b207cf3c3e9eaedf031810153b8a576d3 Mon Sep 17 00:00:00 2001
From: Elichai Turkel <elichai.turkel@gmail.com>
Date: Tue, 1 Dec 2020 13:18:41 +0200
Subject: [PATCH] Fix the non-json tests

---
 domain/consensus/processes/ghostdag_test.go          | 12 ++++++------
 .../ghostdagmanager/ghostdagWithJson_test.go         |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/domain/consensus/processes/ghostdag_test.go b/domain/consensus/processes/ghostdag_test.go
index 9ae62d9e8..a99234f9a 100644
--- a/domain/consensus/processes/ghostdag_test.go
+++ b/domain/consensus/processes/ghostdag_test.go
@@ -129,7 +129,7 @@ func TestGHOSTDA(t *testing.T) {
 			parents:                []*externalapi.DomainHash{{2}, {3}, {4}},
 			expectedBlueScore:      6,
 			expectedSelectedParent: &externalapi.DomainHash{4},
-			expectedMergeSetBlues:  []*externalapi.DomainHash{{2}, {3}, {4}},
+			expectedMergeSetBlues:  []*externalapi.DomainHash{{4}, {2}, {3}},
 			expectedMergeSetReds:   []*externalapi.DomainHash{},
 		},
 		{ /* 6 */
@@ -170,7 +170,7 @@ func TestGHOSTDA(t *testing.T) {
 			expectedBlueScore:      7,
 			expectedSelectedParent: &externalapi.DomainHash{5},
 			expectedMergeSetBlues:  []*externalapi.DomainHash{{5}},
-			expectedMergeSetReds:   []*externalapi.DomainHash{{9}, {8}, {7}, {6}},
+			expectedMergeSetReds:   []*externalapi.DomainHash{{6}, {7}, {8}, {9}},
 		},
 	}}
 
@@ -213,7 +213,7 @@ func TestGHOSTDA(t *testing.T) {
 			parents:                []*externalapi.DomainHash{{2}, {3}, {4}},
 			expectedBlueScore:      6,
 			expectedSelectedParent: &externalapi.DomainHash{4},
-			expectedMergeSetBlues:  []*externalapi.DomainHash{{2}, {3}, {4}},
+			expectedMergeSetBlues:  []*externalapi.DomainHash{{4}, {2}, {3}},
 			expectedMergeSetReds:   []*externalapi.DomainHash{},
 		},
 		{ /* 6 */
@@ -309,7 +309,7 @@ func TestGHOSTDA(t *testing.T) {
 			parents:                []*externalapi.DomainHash{{3}, {5}},
 			expectedBlueScore:      6,
 			expectedSelectedParent: &externalapi.DomainHash{5},
-			expectedMergeSetBlues:  []*externalapi.DomainHash{{2}, {3}, {5}},
+			expectedMergeSetBlues:  []*externalapi.DomainHash{{5}, {2}, {3}},
 			expectedMergeSetReds:   []*externalapi.DomainHash{},
 		},
 		{
@@ -377,7 +377,7 @@ func TestGHOSTDA(t *testing.T) {
 			parents:                []*externalapi.DomainHash{{1}, {2}, {3}, {4}},
 			expectedBlueScore:      6,
 			expectedSelectedParent: &externalapi.DomainHash{4},
-			expectedMergeSetBlues:  []*externalapi.DomainHash{{4}, {3}, {2}, {1}},
+			expectedMergeSetBlues:  []*externalapi.DomainHash{{4}, {1}, {2}, {3}},
 			expectedMergeSetReds:   []*externalapi.DomainHash{},
 		},
 		{
@@ -385,7 +385,7 @@ func TestGHOSTDA(t *testing.T) {
 			parents:                []*externalapi.DomainHash{{1}, {2}, {3}},
 			expectedBlueScore:      5,
 			expectedSelectedParent: &externalapi.DomainHash{3},
-			expectedMergeSetBlues:  []*externalapi.DomainHash{{2}, {1}, {3}},
+			expectedMergeSetBlues:  []*externalapi.DomainHash{{3}, {1}, {2}},
 			expectedMergeSetReds:   []*externalapi.DomainHash{},
 		},
 		{
diff --git a/domain/consensus/processes/ghostdagmanager/ghostdagWithJson_test.go b/domain/consensus/processes/ghostdagmanager/ghostdagWithJson_test.go
index 81f53ba3b..82e56fa33 100644
--- a/domain/consensus/processes/ghostdagmanager/ghostdagWithJson_test.go
+++ b/domain/consensus/processes/ghostdagmanager/ghostdagWithJson_test.go
@@ -57,6 +57,7 @@ func TestGHOSTDAG(t *testing.T) {
 		BluesAnticoneSizes: nil,
 	}
 
+	var testsCounter int
 	err := filepath.Walk("../../testdata/dags", func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -136,11 +137,15 @@ func TestGHOSTDAG(t *testing.T) {
 			ghostdagDataStore.dagMap[genesisHash] = blockGHOSTDAGDataGenesis
 		}
 
+		testsCounter++
 		return nil
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
+	if testsCounter != 3 {
+		t.Fatalf("Expected 3 test files, ran %d instead", testsCounter)
+	}
 }
 
 func hashesToStrings(arr []*externalapi.DomainHash) []string {