Fixed shard id calculation

klim0v · Sep 30, 2024 · d051d43 · d051d43
1 parent 8ac5d4f
commit d051d43
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/tlb/shard.go b/tlb/shard.go
@@ -197,5 +197,8 @@ func (s ShardIdent) IsParent(of ShardIdent) bool {
 }
 
 func (s ShardIdent) GetShardID() ShardID {
-	return ShardID(s.ShardPrefix)
+	if s.PrefixBits > 63 {
+		return ShardID(0)
+	}
+	return ShardID(s.ShardPrefix | 1<<(63-s.PrefixBits))
 }
diff --git a/tlb/shard_test.go b/tlb/shard_test.go
@@ -293,6 +293,7 @@ func TestShardIdent_IsAncestor(t *testing.T) {
 
 func TestShardIdent_GetShardID(t *testing.T) {
 	type fields struct {
+		PrefixBits  int8
 		ShardPrefix uint64
 	}
 	tests := []struct {
@@ -303,18 +304,20 @@ func TestShardIdent_GetShardID(t *testing.T) {
 		{
 			name: "ok",
 			fields: fields{
-				ShardPrefix: 0xE000000000000000,
+				PrefixBits:  2,
+				ShardPrefix: 0x4000000000000000,
 			},
-			want: 0xE000000000000000,
+			want: 0x6000000000000000,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			s := ShardIdent{
+				PrefixBits:  tt.fields.PrefixBits,
 				ShardPrefix: tt.fields.ShardPrefix,
 			}
 			if got := s.GetShardID(); got != tt.want {
-				t.Errorf("GetShardID() = %v, want %v", got, tt.want)
+				t.Errorf("GetShardID() = %x, want %x", got, tt.want)
 			}
 		})
 	}