fix(redunadncy): amend parity numbers (#4547)

Co-authored-by: Gyorgy Barabas <[email protected]>
ethersphere · Jan 20, 2024 · 218fe7e · 218fe7e
1 parent 02ddf61
commit 218fe7e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/pkg/file/pipeline/hashtrie/hashtrie_test.go b/pkg/file/pipeline/hashtrie/hashtrie_test.go
@@ -302,14 +302,14 @@ func TestRedundancy(t *testing.T) {
 			level:      redundancy.INSANE,
 			encryption: false,
 			writes:     98, // 97 chunk references fit into one chunk + 1 carrier
-			parities:   38, // 31 (full ch) + 7 (2 ref)
+			parities:   37, // 31 (full ch) + 6 (2 ref)
 		},
 		{
 			desc:       "redundancy write for encrypted data",
 			level:      redundancy.PARANOID,
 			encryption: true,
 			writes:     21,  // 21 encrypted chunk references fit into one chunk + 1 carrier
-			parities:   118, // // 88 (full ch) + 30 (2 ref)
+			parities:   116, // // 87 (full ch) + 29 (2 ref)
 		},
 	} {
 		tc := tc

diff --git a/pkg/file/redundancy/level.go b/pkg/file/redundancy/level.go
@@ -107,44 +107,40 @@ func (l Level) Decrement() Level {
 // TABLE INITS
 
 var mediumEt = newErasureTable(
-	[]int{94, 68, 46, 28, 14, 5, 1},
-	[]int{9, 8, 7, 6, 5, 4, 3},
+	[]int{95, 69, 47, 29, 15, 6, 2, 1},
+	[]int{9, 8, 7, 6, 5, 4, 3, 2},
 )
 var encMediumEt = newErasureTable(
-	[]int{47, 34, 23, 14, 7, 2},
-	[]int{9, 8, 7, 6, 5, 4},
+	[]int{47, 34, 23, 14, 7, 3, 1},
+	[]int{9, 8, 7, 6, 5, 4, 3},
 )
 
 var strongEt = newErasureTable(
-	[]int{104, 95, 86, 77, 69, 61, 53, 46, 39, 32, 26, 20, 15, 10, 6, 3, 1},
-	[]int{21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5},
+	[]int{105, 96, 87, 78, 70, 62, 54, 47, 40, 33, 27, 21, 16, 11, 7, 4, 2, 1},
+	[]int{21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4},
 )
 var encStrongEt = newErasureTable(
-	[]int{52, 47, 43, 38, 34, 30, 26, 23, 19, 16, 13, 10, 7, 5, 3, 1},
-	[]int{21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6},
+	[]int{52, 48, 43, 39, 35, 31, 27, 23, 20, 16, 13, 10, 8, 5, 3, 2, 1},
+	[]int{21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5},
 )
 
 var insaneEt = newErasureTable(
-	[]int{92, 87, 82, 77, 73, 68, 63, 59, 54, 50, 45, 41, 37, 33, 29, 26, 22, 19, 16, 13, 10, 8, 5, 3, 2, 1},
-	[]int{31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6},
+	[]int{93, 88, 83, 78, 74, 69, 64, 60, 55, 51, 46, 42, 38, 34, 30, 27, 23, 20, 17, 14, 11, 9, 6, 4, 3, 2, 1},
+	[]int{31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5},
 )
 var encInsaneEt = newErasureTable(
-	[]int{46, 43, 41, 38, 36, 34, 31, 29, 27, 25, 22, 20, 18, 16, 14, 13, 11, 9, 8, 6, 5, 4, 2, 1},
-	[]int{31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 7},
+	[]int{46, 44, 41, 39, 37, 34, 32, 30, 27, 25, 23, 21, 19, 17, 15, 13, 11, 10, 8, 7, 5, 4, 3, 2, 1},
+	[]int{31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 6},
 )
 
 var paranoidEt = newErasureTable(
 	[]int{
-		37, 36, 35, 34, 33, 32, 31, 30, 29, 28,
-		27, 26, 25, 24, 23, 22, 21, 20, 19, 18,
-		17, 16, 15, 14, 13, 12, 11, 10, 9, 8,
-		7, 6, 5, 4, 3, 2, 1,
+		37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18,
+		17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1,
 	},
 	[]int{
-		90, 88, 87, 85, 84, 82, 81, 79, 77, 76,
-		74, 72, 71, 69, 67, 66, 64, 62, 60, 59,
-		57, 55, 53, 51, 49, 48, 46, 44, 41, 39,
-		37, 35, 32, 30, 27, 24, 20,
+		89, 87, 86, 84, 83, 81, 80, 78, 76, 75, 73, 71, 70, 68, 66, 65, 63, 61, 59, 58,
+		56, 54, 52, 50, 48, 47, 45, 43, 40, 38, 36, 34, 31, 29, 26, 23, 19,
 	},
 )
 var encParanoidEt = newErasureTable(
@@ -153,8 +149,8 @@ var encParanoidEt = newErasureTable(
 		8, 7, 6, 5, 4, 3, 2, 1,
 	},
 	[]int{
-		88, 85, 82, 79, 76, 72, 69, 66, 62, 59,
-		55, 51, 48, 44, 39, 35, 30, 24,
+		87, 84, 81, 78, 75, 71, 68, 65, 61, 58,
+		54, 50, 47, 43, 38, 34, 29, 23,
 	},
 )