feat: Removed old Schedule schema states. (#16437)

Signed-off-by: Iris Simon <[email protected]>

hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/schemas/V0570ScheduleSchema.java

@@ -61,22 +61,21 @@ public final class V0570ScheduleSchema extends Schema {
      * Instantiates a new V0570 (version 0.57.0) schedule schema.
      */
     public V0570ScheduleSchema() {
-
         super(VERSION);
     }
 
     @SuppressWarnings("rawtypes")
     @NonNull
     @Override
     public Set<StateDefinition> statesToCreate() {
-        return Set.of(scheduleIdsByExpirySec(), schedulesByEquality());
+        return Set.of(scheduleIdsByExpirySec(), scheduleIdByEquality());
     }
 
-    //    @NonNull
-    //    @Override
-    //    public Set<String> statesToRemove() {
-    //        return Set.of(SCHEDULES_BY_EXPIRY_SEC_KEY, SCHEDULES_BY_EQUALITY_KEY);
-    //    }
+    @NonNull
+    @Override
+    public Set<String> statesToRemove() {
+        return Set.of(SCHEDULES_BY_EXPIRY_SEC_KEY, SCHEDULES_BY_EQUALITY_KEY);
+    }
 
     @Override
     public void migrate(@NonNull final MigrationContext ctx) {
@@ -137,7 +136,7 @@ private static StateDefinition<ProtoLong, ScheduleIdList> scheduleIdsByExpirySec
                 MAX_SCHEDULE_IDS_BY_EXPIRY_SEC_KEY);
     }
 
-    private static StateDefinition<ProtoBytes, ScheduleID> schedulesByEquality() {
+    private static StateDefinition<ProtoBytes, ScheduleID> scheduleIdByEquality() {
         return StateDefinition.onDisk(
                 SCHEDULE_ID_BY_EQUALITY_KEY, ProtoBytes.PROTOBUF, ScheduleID.PROTOBUF, MAX_SCHEDULE_ID_BY_EQUALITY);
     }

hedera-node/hedera-schedule-service-impl/src/test/java/com/hedera/node/app/service/schedule/impl/schemas/V0570ScheduleSchemaTest.java

@@ -24,6 +24,7 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.BDDMockito.given;
 
 import com.hedera.hapi.node.base.ScheduleID;
@@ -116,9 +117,8 @@ void statesToCreateIsCorrect() {
     void testStatesToRemove() {
         Set<String> statesToRemove = subject.statesToRemove();
         assertNotNull(statesToRemove);
-        assertEquals(0, statesToRemove.size());
-        //        assertTrue(statesToRemove.containsAll(Set.of(SCHEDULES_BY_EXPIRY_SEC_KEY,
-        // SCHEDULES_BY_EQUALITY_KEY)));
+        assertEquals(2, statesToRemove.size());
+        assertTrue(statesToRemove.containsAll(Set.of(SCHEDULES_BY_EXPIRY_SEC_KEY, SCHEDULES_BY_EQUALITY_KEY)));
     }
 
     @SuppressWarnings("DataFlowIssue")

version.txt

@@ -1 +1 @@
-0.56.0
+0.57.0