fix: Reset stateful variables in WritableQueueStateBase on commit() (…

…#17905) Signed-off-by: Neeharika-Sompalli <[email protected]>
hiero-ledger · Feb 14, 2025 · deeb01d · deeb01d
1 parent 63cdf34
commit deeb01d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/...ds-platform-core/src/test/java/com/swirlds/platform/state/WritableQueueStateBaseTest.java b/...ds-platform-core/src/test/java/com/swirlds/platform/state/WritableQueueStateBaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
+ * Copyright (C) 2023-2025 Hedera Hashgraph, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.inOrder;
 
 import com.swirlds.state.spi.QueueChangeListener;
@@ -341,6 +342,23 @@ void commitAfterRemovingSomeAddedElementsOnlyIncludesAdded() {
             assertThat(backingList).containsExactly(CHEMISTRY);
         }
 
+        @Test
+        void commitResetsIndex() {
+            final var backingList = new LinkedList<String>();
+            final var subject = new ListWritableQueueState<>(STEAM_STATE_KEY, backingList);
+            subject.add(ART);
+            subject.add(BIOLOGY);
+            subject.removeIf(s -> true);
+            assertEquals(BIOLOGY, subject.peek());
+            subject.removeIf(s -> true);
+            subject.commit();
+            assertThat(backingList).isEmpty();
+
+            subject.add(ART);
+            subject.add(ECOLOGY);
+            assertEquals(ART, subject.peek());
+        }
+
         @Test
         void commitAfterPeekingAndAddingStillAddsEverything() {
             final var backingList = new LinkedList<String>();

diff --git a/...orm-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/WritableQueueStateBase.java b/...orm-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/WritableQueueStateBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
+ * Copyright (C) 2023-2025 Hedera Hashgraph, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -114,6 +114,7 @@ public final void reset() {
         addedElements.clear();
         peekedElement = null;
         dsIterator = null;
+        currentAddedElementIndex = 0;
     }
 
     @NonNull