revert state history changes.

radixdlt · Jul 27, 2023 · ca08698 · ca08698
1 parent 1380cf7
commit ca08698
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/...ixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs b/...ixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/PostgresLedgerExtenderService.cs
@@ -859,7 +859,7 @@ private async Task<ExtendLedgerReport> ProcessTransactions(ReadWriteDbContext db
                                 Id = sequences.EntityStateHistorySequence++,
                                 FromStateVersion = stateVersion,
                                 EntityId = referencedEntities.Get((EntityAddress)substateId.EntityAddress).DatabaseId,
-                                State = componentState.Value.DataStruct.StructData.Hex.ConvertFromHex(),
+                                State = componentState.Value.DataStruct.StructData.ToJson(),
                             });
                         }
 

diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/WriteHelper.cs
@@ -462,7 +462,7 @@ public async Task<int> CopyEntityStateHistory(ICollection<EntityStateHistory> en
             await writer.WriteAsync(e.Id, NpgsqlDbType.Bigint, token);
             await writer.WriteAsync(e.FromStateVersion, NpgsqlDbType.Bigint, token);
             await writer.WriteAsync(e.EntityId, NpgsqlDbType.Bigint, token);
-            await writer.WriteAsync(e.State, NpgsqlDbType.Bytea, token);
+            await writer.WriteAsync(e.State, NpgsqlDbType.Jsonb, token);
         }
 
         await writer.CompleteAsync(token);

diff --git a/.../20230727102737_InitialCreate.Designer.cs → .../20230727103946_InitialCreate.Designer.cs b/.../20230727102737_InitialCreate.Designer.cs → .../20230727103946_InitialCreate.Designer.cs
diff --git a/...igrations/20230727102737_InitialCreate.cs → ...igrations/20230727103946_InitialCreate.cs b/...igrations/20230727102737_InitialCreate.cs → ...igrations/20230727103946_InitialCreate.cs
@@ -323,7 +323,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     from_state_version = table.Column<long>(type: "bigint", nullable: false),
                     entity_id = table.Column<long>(type: "bigint", nullable: false),
-                    state = table.Column<byte[]>(type: "bytea", nullable: false)
+                    state = table.Column<string>(type: "jsonb", nullable: false)
                 },
                 constraints: table =>
                 {

diff --git a/...adixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs b/...adixDlt.NetworkGateway.PostgresIntegration/Migrations/MigrationsDbContextModelSnapshot.cs
@@ -574,9 +574,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("bigint")
                         .HasColumnName("from_state_version");
 
-                    b.Property<byte[]>("State")
+                    b.Property<string>("State")
                         .IsRequired()
-                        .HasColumnType("bytea")
+                        .HasColumnType("jsonb")
                         .HasColumnName("state");
 
                     b.HasKey("Id");

diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Models/EntityStateHistory.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Models/EntityStateHistory.cs
@@ -80,6 +80,6 @@ internal class EntityStateHistory
     [Column("entity_id")]
     public long EntityId { get; set; }
 
-    [Column("state")]
-    public byte[] State { get; set; }
+    [Column("state", TypeName = "jsonb")]
+    public string State { get; set; }
 }