plugin/evm/header/extra_test.go: TestPredicateBytesExtra

Author: qdm12

plugin/evm/header/extra_test.go

@@ -609,74 +609,68 @@ func TestVerifyExtra(t *testing.T) {
 	}
 }
 
-func TestPredicateBytesFromExtra(t *testing.T) {
+func TestPredicateBytesExtra(t *testing.T) {
 	tests := []struct {
-		name     string
-		rules    extras.AvalancheRules
-		extra    []byte
-		expected []byte
+		name                   string
+		rules                  extras.AvalancheRules
+		extra                  []byte
+		predicate              []byte
+		wantExtraWithPredicate []byte
+		wantPredicateBytes     []byte
 	}{
 		{
-			name:     "empty_extra",
-			extra:    nil,
-			expected: nil,
-		},
-		{
-			name:     "too_short",
-			extra:    make([]byte, ap3.WindowSize-1),
-			expected: nil,
-		},
-		{
-			name:     "empty_predicate",
-			extra:    make([]byte, ap3.WindowSize),
-			expected: nil,
-		},
-		{
-			name: "non_empty_predicate",
-			extra: []byte{
-				ap3.WindowSize: 5,
-			},
-			expected: []byte{5},
+			name:                   "empty_extra_predicate",
+			extra:                  nil,
+			predicate:              nil,
+			wantExtraWithPredicate: make([]byte, ap3.WindowSize),
+			wantPredicateBytes:     nil,
 		},
 		{
-			name: "fortuna_empty_extra",
+			name: "empty_extra_predicate_fortuna",
 			rules: extras.AvalancheRules{
 				IsFortuna: true,
 			},
-			extra:    nil,
-			expected: nil,
+			extra:                  nil,
+			predicate:              nil,
+			wantExtraWithPredicate: make([]byte, acp176.StateSize),
+			wantPredicateBytes:     nil,
 		},
 		{
-			name: "fortuna_too_short",
-			rules: extras.AvalancheRules{
-				IsFortuna: true,
+			name: "extra_too_short",
+			extra: []byte{
+				0:                  1,
+				ap3.WindowSize - 1: 0,
 			},
-			extra:    make([]byte, acp176.StateSize-1),
-			expected: nil,
-		},
-		{
-			name: "fortuna_empty_predicate",
-			rules: extras.AvalancheRules{
-				IsFortuna: true,
+			predicate: []byte{2},
+			wantExtraWithPredicate: []byte{
+				0:              1,
+				ap3.WindowSize: 2,
 			},
-			extra:    make([]byte, acp176.StateSize),
-			expected: nil,
+			wantPredicateBytes: []byte{2},
 		},
 		{
-			name: "fortuna_non_empty_predicate",
+			name: "extra_too_short_fortuna",
 			rules: extras.AvalancheRules{
 				IsFortuna: true,
 			},
 			extra: []byte{
-				acp176.StateSize: 5,
+				0:                    1,
+				acp176.StateSize - 1: 0,
+			},
+			predicate: []byte{2},
+			wantExtraWithPredicate: []byte{
+				0:                1,
+				acp176.StateSize: 2,
 			},
-			expected: []byte{5},
+			wantPredicateBytes: []byte{2},
 		},
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got := PredicateBytesFromExtra(test.rules, test.extra)
-			require.Equal(t, test.expected, got)
+			got := SetPredicateBytesInExtra(test.rules, test.extra, test.predicate)
+			require.Equal(t, test.wantExtraWithPredicate, got)
+			got = PredicateBytesFromExtra(test.rules, test.extra)
+			require.Equal(t, test.wantPredicateBytes, got)
 		})
 	}
 }
@@ -689,17 +683,6 @@ func TestSetPredicateBytesInExtra(t *testing.T) {
 		predicate []byte
 		want      []byte
 	}{
-		{
-			name: "empty_extra_predicate",
-			want: make([]byte, ap3.WindowSize),
-		},
-		{
-			name: "empty_extra_predicate_fortuna",
-			rules: extras.AvalancheRules{
-				IsFortuna: true,
-			},
-			want: make([]byte, acp176.StateSize),
-		},
 		{
 			name:      "extra_too_short",
 			extra:     []byte{1},