diff --git a/.github/workflows/support/citr/log4j2.xml b/.github/workflows/support/citr/log4j2.xml index 5728853408bb..f71db2d2f3ce 100644 --- a/.github/workflows/support/citr/log4j2.xml +++ b/.github/workflows/support/citr/log4j2.xml @@ -76,16 +76,6 @@ - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -219,11 +209,6 @@ - - - - - diff --git a/hedera-node/configuration/compose/log4j2.xml b/hedera-node/configuration/compose/log4j2.xml index 7e64e0b8b475..627ab8881de5 100644 --- a/hedera-node/configuration/compose/log4j2.xml +++ b/hedera-node/configuration/compose/log4j2.xml @@ -74,17 +74,6 @@ - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -218,11 +207,6 @@ - - - - - diff --git a/hedera-node/configuration/dev/log4j2.xml b/hedera-node/configuration/dev/log4j2.xml index f6aa1b7178d6..d3cd9ba103a8 100644 --- a/hedera-node/configuration/dev/log4j2.xml +++ b/hedera-node/configuration/dev/log4j2.xml @@ -82,16 +82,6 @@ - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -225,11 +215,6 @@ - - - - - diff --git a/hedera-node/configuration/mainnet/log4j2.xml b/hedera-node/configuration/mainnet/log4j2.xml index 5a8115dfcbcf..112162c6ec1e 100644 --- a/hedera-node/configuration/mainnet/log4j2.xml +++ b/hedera-node/configuration/mainnet/log4j2.xml @@ -82,16 +82,6 @@ - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -225,12 +215,6 @@ - - - - - - diff --git a/hedera-node/configuration/preprod/log4j2.xml b/hedera-node/configuration/preprod/log4j2.xml index 973cea66eb2a..27e9467a106d 100644 --- a/hedera-node/configuration/preprod/log4j2.xml +++ b/hedera-node/configuration/preprod/log4j2.xml @@ -82,16 +82,6 @@ - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -225,11 +215,6 @@ - - - - - diff --git a/hedera-node/configuration/previewnet/log4j2.xml b/hedera-node/configuration/previewnet/log4j2.xml index 65fc78fd0888..0dfeba7e31ad 100644 --- a/hedera-node/configuration/previewnet/log4j2.xml +++ b/hedera-node/configuration/previewnet/log4j2.xml @@ -82,17 +82,6 @@ - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -226,12 +215,6 @@ - - - - - - diff --git a/hedera-node/configuration/testnet/log4j2.xml b/hedera-node/configuration/testnet/log4j2.xml index 54d456164e1f..d4426ee9cfab 100644 --- a/hedera-node/configuration/testnet/log4j2.xml +++ b/hedera-node/configuration/testnet/log4j2.xml @@ -82,17 +82,6 @@ - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -226,11 +215,6 @@ - - - - - diff --git a/hedera-node/log4j2.xml b/hedera-node/log4j2.xml index adc6136c463d..0535e371bdb5 100644 --- a/hedera-node/log4j2.xml +++ b/hedera-node/log4j2.xml @@ -73,16 +73,6 @@ - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - - @@ -216,11 +206,6 @@ - - - - - diff --git a/hedera-node/test-clients/src/main/resources/log4j2-test.xml b/hedera-node/test-clients/src/main/resources/log4j2-test.xml index 98d9dd083434..f413f4db6d87 100644 --- a/hedera-node/test-clients/src/main/resources/log4j2-test.xml +++ b/hedera-node/test-clients/src/main/resources/log4j2-test.xml @@ -28,16 +28,6 @@ - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n - - - - @@ -46,11 +36,6 @@ - - - - - diff --git a/platform-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/ReadableKVStateBase.java b/platform-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/ReadableKVStateBase.java index e5679a258dc6..612fd60212c2 100644 --- a/platform-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/ReadableKVStateBase.java +++ b/platform-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/ReadableKVStateBase.java @@ -29,9 +29,6 @@ public abstract class ReadableKVStateBase implements ReadableKVState private static final Object marker = new Object(); - /** State label used in logs, typically serviceName.stateKey */ - protected final String label; - /** The state ID */ protected final int stateId; @@ -55,7 +52,6 @@ protected ReadableKVStateBase(final int stateId, final String label) { // This constructor is used by some consumers of the API that are outside of this repository. protected ReadableKVStateBase(final int stateId, final String label, @NonNull ConcurrentMap readCache) { this.stateId = stateId; - this.label = label; this.readCache = Objects.requireNonNull(readCache); this.unmodifiableReadKeys = Collections.unmodifiableSet(readCache.keySet()); } diff --git a/platform-sdk/swirlds-state-api/src/test/java/com/swirlds/state/spi/ReadableKVStateBaseTest.java b/platform-sdk/swirlds-state-api/src/test/java/com/swirlds/state/spi/ReadableKVStateBaseTest.java index 382cc007e806..63d7f8bc6075 100644 --- a/platform-sdk/swirlds-state-api/src/test/java/com/swirlds/state/spi/ReadableKVStateBaseTest.java +++ b/platform-sdk/swirlds-state-api/src/test/java/com/swirlds/state/spi/ReadableKVStateBaseTest.java @@ -53,13 +53,6 @@ void testStateId() { assertThat(state.getStateId()).isEqualTo(FRUIT_STATE_ID); } - /** Make sure the constructor is holding onto the state label properly */ - @Test - @DisplayName("The state label must match what was provided in the constructor") - void testStateLabel() { - assertThat(state.label).isEqualTo(FRUIT_STATE_LABEL); - } - /** * When we are asked to get an unknown item (something not in the backing store), the {@link * ReadableKVStateBase} still needs to remember this key and include it in the set of read keys, diff --git a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java index 942200ba8cbb..948884f68a58 100644 --- a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java +++ b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java @@ -2,9 +2,6 @@ package com.swirlds.state.merkle.disk; import static com.swirlds.state.merkle.StateUtils.getStateKeyForKv; -import static com.swirlds.state.merkle.logging.StateLogger.logMapGet; -import static com.swirlds.state.merkle.logging.StateLogger.logMapGetSize; -import static com.swirlds.state.merkle.logging.StateLogger.logMapIterate; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -63,18 +60,13 @@ public OnDiskReadableKVState( protected V readFromDataSource(@NonNull K key) { final Bytes stateKey = getStateKeyForKv(stateId, key, keyCodec); final StateValue stateValue = virtualMap.get(stateKey, stateValueCodec); - final V value = stateValue != null ? stateValue.value() : null; - // Log to transaction state log, what was read - logMapGet(label, key, value); - return value; + return stateValue != null ? stateValue.value() : null; } /** {@inheritDoc} */ @NonNull @Override protected Iterator iterateFromDataSource() { - // Log to transaction state log, what was iterated - logMapIterate(label, virtualMap, keyCodec); return new OnDiskIterator<>(virtualMap, keyCodec, stateId); } @@ -84,10 +76,7 @@ protected Iterator iterateFromDataSource() { @Override @Deprecated public long size() { - final var size = virtualMap.size(); - // Log to transaction state log, size of map - logMapGetSize(label, size); - return size; + return virtualMap.size(); } @Override diff --git a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableQueueState.java b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableQueueState.java index b9221b74f131..f1bda28df78f 100644 --- a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableQueueState.java +++ b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableQueueState.java @@ -1,9 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.merkle.disk; -import static com.swirlds.state.merkle.logging.StateLogger.logQueueIterate; -import static com.swirlds.state.merkle.logging.StateLogger.logQueuePeek; - import com.hedera.pbj.runtime.Codec; import com.swirlds.state.spi.ReadableQueueState; import com.swirlds.state.spi.ReadableQueueStateBase; @@ -45,10 +42,7 @@ public OnDiskReadableQueueState( protected V peekOnDataSource() { final QueueState state = onDiskQueueHelper.getState(); Objects.requireNonNull(state); - final V value = OnDiskQueueHelper.isEmpty(state) ? null : onDiskQueueHelper.getFromStore(state.head()); - // Log to transaction state log, what was peeked - logQueuePeek(label, value); - return value; + return OnDiskQueueHelper.isEmpty(state) ? null : onDiskQueueHelper.getFromStore(state.head()); } /** Iterate over all elements */ @@ -60,10 +54,7 @@ protected Iterator iterateOnDataSource() { // Empty iterator return onDiskQueueHelper.iterateOnDataSource(0, 0); } else { - final Iterator it = onDiskQueueHelper.iterateOnDataSource(state.head(), state.tail()); - // Log to transaction state log, what was iterated - logQueueIterate(label, state.tail() - state.head(), it); - return it; + return onDiskQueueHelper.iterateOnDataSource(state.head(), state.tail()); } } } diff --git a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableSingletonState.java b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableSingletonState.java index dde8710eb360..5ca4ce7d3954 100644 --- a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableSingletonState.java +++ b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableSingletonState.java @@ -2,7 +2,6 @@ package com.swirlds.state.merkle.disk; import static com.swirlds.state.merkle.StateUtils.getStateKeyForSingleton; -import static com.swirlds.state.merkle.logging.StateLogger.logSingletonRead; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -53,9 +52,6 @@ public OnDiskReadableSingletonState( protected V readFromDataSource() { final Bytes key = getStateKeyForSingleton(stateId); final StateValue stateValue = virtualMap.get(key, stateValueCodec); - final V value = stateValue != null ? stateValue.value() : null; - // Log to transaction state log, what was read - logSingletonRead(label, value); - return value; + return stateValue != null ? stateValue.value() : null; } } diff --git a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableKVState.java b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableKVState.java index 3c13c70679aa..36303daae520 100644 --- a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableKVState.java +++ b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableKVState.java @@ -3,11 +3,6 @@ import static com.swirlds.state.merkle.StateUtils.getStateKeyForKv; import static com.swirlds.state.merkle.StateUtils.getStateValueForKv; -import static com.swirlds.state.merkle.logging.StateLogger.logMapGet; -import static com.swirlds.state.merkle.logging.StateLogger.logMapGetSize; -import static com.swirlds.state.merkle.logging.StateLogger.logMapIterate; -import static com.swirlds.state.merkle.logging.StateLogger.logMapPut; -import static com.swirlds.state.merkle.logging.StateLogger.logMapRemove; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -66,18 +61,13 @@ public OnDiskWritableKVState( protected V readFromDataSource(@NonNull K key) { final Bytes stateKey = getStateKeyForKv(stateId, key, keyCodec); final StateValue stateValue = virtualMap.get(stateKey, stateValueCodec); - final V value = stateValue != null ? stateValue.value() : null; - // Log to transaction state log, what was read - logMapGet(label, key, value); - return value; + return stateValue != null ? stateValue.value() : null; } /** {@inheritDoc} */ @NonNull @Override protected Iterator iterateFromDataSource() { - // Log to transaction state log, what was iterated - logMapIterate(label, virtualMap, keyCodec); return new OnDiskIterator<>(virtualMap, keyCodec, stateId); } @@ -90,8 +80,6 @@ protected void putIntoDataSource(@NonNull K key, @NonNull V value) { final StateValue stateValue = getStateValueForKv(stateId, value); virtualMap.put(keyBytes, stateValue, stateValueCodec); - // Log to transaction state log, what was put - logMapPut(label, key, value); } /** {@inheritDoc} */ @@ -100,16 +88,11 @@ protected void removeFromDataSource(@NonNull K key) { final Bytes stateKey = getStateKeyForKv(stateId, key, keyCodec); final StateValue stateValue = virtualMap.remove(stateKey, stateValueCodec); final var removedValue = stateValue != null ? stateValue.value() : null; - // Log to transaction state log, what was removed - logMapRemove(label, key, removedValue); } /** {@inheritDoc} */ @Override public long sizeOfDataSource() { - final var size = virtualMap.size(); - // Log to transaction state log, size of map - logMapGetSize(label, size); - return size; + return virtualMap.size(); } } diff --git a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableQueueState.java b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableQueueState.java index d6a1dc92c597..af1ab7ea9589 100644 --- a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableQueueState.java +++ b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableQueueState.java @@ -1,9 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.merkle.disk; -import static com.swirlds.state.merkle.logging.StateLogger.logQueueAdd; -import static com.swirlds.state.merkle.logging.StateLogger.logQueueIterate; -import static com.swirlds.state.merkle.logging.StateLogger.logQueueRemove; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -50,8 +47,6 @@ protected void addToDataSource(@NonNull V value) { onDiskQueueHelper.addToStore(state.tail(), value); // increment tail and update state onDiskQueueHelper.updateState(state.elementAdded()); - // Log to transaction state log, what was added - logQueueAdd(label, value); } /** {@inheritDoc} */ @@ -62,12 +57,8 @@ protected void removeFromDataSource() { final V removedValue = onDiskQueueHelper.removeFromStore(state.head()); // increment head and update state onDiskQueueHelper.updateState(state.elementRemoved()); - // Log to transaction state log, what was removed - logQueueRemove(label, removedValue); } else { // Should it be considered an error? - // Log to transaction state log, what was removed - logQueueRemove(label, null); } } @@ -80,10 +71,7 @@ protected Iterator iterateOnDataSource() { // Empty iterator return onDiskQueueHelper.iterateOnDataSource(0, 0); } else { - final Iterator it = onDiskQueueHelper.iterateOnDataSource(state.head(), state.tail()); - // Log to transaction state log, what was iterated - logQueueIterate(label, state.tail() - state.head(), it); - return it; + return onDiskQueueHelper.iterateOnDataSource(state.head(), state.tail()); } } } diff --git a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableSingletonState.java b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableSingletonState.java index 3387743f1523..41c97abf1f37 100644 --- a/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableSingletonState.java +++ b/platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskWritableSingletonState.java @@ -3,9 +3,6 @@ import static com.swirlds.state.merkle.StateUtils.getStateKeyForSingleton; import static com.swirlds.state.merkle.StateUtils.getStateValueForSingleton; -import static com.swirlds.state.merkle.logging.StateLogger.logSingletonRead; -import static com.swirlds.state.merkle.logging.StateLogger.logSingletonRemove; -import static com.swirlds.state.merkle.logging.StateLogger.logSingletonWrite; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -55,10 +52,7 @@ public OnDiskWritableSingletonState( protected V readFromDataSource() { final Bytes stateKey = getStateKeyForSingleton(stateId); final StateValue stateValue = virtualMap.get(stateKey, stateValueCodec); - final V value = stateValue != null ? stateValue.value() : null; - // Log to transaction state log, what was read - logSingletonRead(label, value); - return value; + return stateValue != null ? stateValue.value() : null; } /** {@inheritDoc} */ @@ -68,8 +62,6 @@ protected void putIntoDataSource(@NonNull V value) { final StateValue stateValue = getStateValueForSingleton(stateId, value); virtualMap.put(stateKey, stateValue, stateValueCodec); - // Log to transaction state log, what was put - logSingletonWrite(label, value); } /** {@inheritDoc} */ @@ -78,7 +70,5 @@ protected void removeFromDataSource() { final Bytes stateKey = getStateKeyForSingleton(stateId); final StateValue stateValue = virtualMap.remove(stateKey, stateValueCodec); final var removedValue = stateValue != null ? stateValue.value() : null; - // Log to transaction state log, what was removed - logSingletonRemove(label, removedValue); } } diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedReadableKVState.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedReadableKVState.java index 384e4c661d56..48c0c74c878c 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedReadableKVState.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedReadableKVState.java @@ -1,9 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.disk; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapGet; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapGetSize; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapIterate; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -58,18 +55,13 @@ public BackedReadableKVState( @Override protected V readFromDataSource(@NonNull K key) { final var kb = keyCodec.toBytes(key); - final var value = virtualMap.get(kb, valueCodec); - // Log to transaction state log, what was read - logMapGet(label, key, value); - return value; + return virtualMap.get(kb, valueCodec); } /** {@inheritDoc} */ @NonNull @Override protected Iterator iterateFromDataSource() { - // Log to transaction state log, what was iterated - logMapIterate(label, virtualMap, keyCodec); return new BackedOnDiskIterator<>(virtualMap, keyCodec); } @@ -77,10 +69,7 @@ protected Iterator iterateFromDataSource() { @Override @Deprecated public long size() { - final var size = virtualMap.size(); - // Log to transaction state log, size of map - logMapGetSize(label, size); - return size; + return virtualMap.size(); } @Override diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedWritableKVState.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedWritableKVState.java index bf7fba588298..ea14cc9a7716 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedWritableKVState.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/disk/BackedWritableKVState.java @@ -1,11 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.disk; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapGet; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapGetSize; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapIterate; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapPut; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logMapRemove; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -61,18 +56,13 @@ public BackedWritableKVState( @Override protected V readFromDataSource(@NonNull K key) { final var kb = keyCodec.toBytes(key); - final var value = virtualMap.get(kb, valueCodec); - // Log to transaction state log, what was read - logMapGet(label, key, value); - return value; + return virtualMap.get(kb, valueCodec); } /** {@inheritDoc} */ @NonNull @Override protected Iterator iterateFromDataSource() { - // Log to transaction state log, what was iterated - logMapIterate(label, virtualMap, keyCodec); return new BackedOnDiskIterator<>(virtualMap, keyCodec); } @@ -82,8 +72,6 @@ protected void putIntoDataSource(@NonNull K key, @NonNull V value) { final Bytes kb = keyCodec.toBytes(key); assert kb != null; virtualMap.put(kb, value, valueCodec); - // Log to transaction state log, what was put - logMapPut(label, key, value); } /** {@inheritDoc} */ @@ -91,16 +79,11 @@ protected void putIntoDataSource(@NonNull K key, @NonNull V value) { protected void removeFromDataSource(@NonNull K key) { final var k = keyCodec.toBytes(key); final var removed = virtualMap.remove(k, valueCodec); - // Log to transaction state log, what was removed - logMapRemove(label, key, removed); } /** {@inheritDoc} */ @Override public long sizeOfDataSource() { - final var size = virtualMap.size(); - // Log to transaction state log, size of map - logMapGetSize(label, size); - return size; + return virtualMap.size(); } } diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedReadableQueueState.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedReadableQueueState.java index 273fbc55c313..d9cac60986a3 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedReadableQueueState.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedReadableQueueState.java @@ -1,7 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.queue; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueuePeek; import static java.util.Objects.requireNonNull; import com.swirlds.state.spi.ReadableQueueState; @@ -31,7 +30,6 @@ public BackedReadableQueueState(final int stateId, @NonNull final String label, @Override protected E peekOnDataSource() { final var value = dataSource.peek(); - logQueuePeek(label, value); return value; } diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedWritableQueueState.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedWritableQueueState.java index 23f053455daf..a999564e1913 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedWritableQueueState.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/BackedWritableQueueState.java @@ -1,8 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.queue; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueueAdd; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueueRemove; import static java.util.Objects.requireNonNull; import com.swirlds.state.spi.WritableQueueStateBase; @@ -34,14 +32,10 @@ protected Iterator iterateOnDataSource() { @Override protected void addToDataSource(@NonNull E element) { dataSource.add(element); - // Log to transaction state log, what was added - logQueueAdd(label, element); } @Override protected void removeFromDataSource() { final var removedValue = dataSource.remove(); - // Log to transaction state log, what was added - logQueueRemove(label, removedValue); } } diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/QueueNode.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/QueueNode.java index 6dec439b1ef9..374e0d8ac8d4 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/QueueNode.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/queue/QueueNode.java @@ -1,10 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.queue; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueueAdd; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueueIterate; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueuePeek; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logQueueRemove; import static java.util.Objects.requireNonNull; import com.hedera.pbj.runtime.Codec; @@ -100,30 +96,22 @@ public String getLabel() { /** Adds an element to this queue. */ public void add(E element) { getQueue().add(new ValueLeaf<>(leafClassId, codec, element)); - // Log to transaction state log, what was added - logQueueAdd(getLabel(), element); } /** Peek an element */ public E peek() { final var valueLeaf = getQueue().peek(); - // Log to transaction state log, what was peeked - logQueuePeek(getLabel(), valueLeaf); return valueLeaf == null ? null : valueLeaf.getValue(); } /** Retrieve and remove an element */ public E remove() { final var valueLeaf = getQueue().remove(); - // Log to transaction state log, what was added - logQueueRemove(getLabel(), valueLeaf); return valueLeaf == null ? null : valueLeaf.getValue(); } /** Iterate over all elements */ public Iterator iterator() { - // Log to transaction state log, what was iterated - logQueueIterate(getLabel(), getRight()); final var itr = getQueue().stream().iterator(); return new Iterator<>() { @Override diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedReadableSingletonState.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedReadableSingletonState.java index 1b7eaa6f760f..43f5da0e1f17 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedReadableSingletonState.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedReadableSingletonState.java @@ -1,8 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.singleton; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logSingletonRead; - import com.swirlds.state.spi.ReadableSingletonStateBase; import com.swirlds.state.test.fixtures.merkle.MerkleStateRoot; import edu.umd.cs.findbugs.annotations.NonNull; @@ -26,9 +24,6 @@ public BackedReadableSingletonState( */ @Override protected T readFromDataSource() { - final var value = backingStore.getValue(); - // Log to transaction state log, what was read - logSingletonRead(label, value); - return value; + return backingStore.getValue(); } } diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedWritableSingletonState.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedWritableSingletonState.java index 92f34098b197..252e9fecd288 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedWritableSingletonState.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/BackedWritableSingletonState.java @@ -1,9 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.singleton; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logSingletonRead; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logSingletonRemove; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logSingletonWrite; import static java.util.Objects.requireNonNull; import com.swirlds.state.spi.WritableSingletonStateBase; @@ -27,26 +24,18 @@ public BackedWritableSingletonState( /** {@inheritDoc} */ @Override protected T readFromDataSource() { - final var value = backingStore.getValue(); - // Log to transaction state log, what was read - logSingletonRead(label, value); - return value; + return backingStore.getValue(); } /** {@inheritDoc} */ @Override protected void putIntoDataSource(@NonNull T value) { backingStore.setValue(value); - // Log to transaction state log, what was put - logSingletonWrite(label, value); } /** {@inheritDoc} */ @Override protected void removeFromDataSource() { - final var removed = backingStore.getValue(); backingStore.setValue(null); - // Log to transaction state log, what was removed - logSingletonRemove(label, removed); } } diff --git a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/SingletonNode.java b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/SingletonNode.java index 6083a6def9e6..f308aa9aa411 100644 --- a/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/SingletonNode.java +++ b/platform-sdk/swirlds-state-impl/src/testFixtures/java/com/swirlds/state/test/fixtures/merkle/singleton/SingletonNode.java @@ -1,9 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 package com.swirlds.state.test.fixtures.merkle.singleton; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logSingletonRead; -import static com.swirlds.state.test.fixtures.merkle.logging.TestStateLogger.logSingletonWrite; - import com.hedera.pbj.runtime.Codec; import com.swirlds.common.merkle.MerkleInternal; import com.swirlds.common.merkle.impl.PartialBinaryMerkleInternal; @@ -70,8 +67,6 @@ public String getLabel() { public T getValue() { final ValueLeaf right = getRight(); - // Log to transaction state log, what was read - logSingletonRead(getLabel(), right); return right.getValue(); } @@ -80,7 +75,5 @@ public void setValue(T value) { right.setValue(value); right.invalidateHash(); invalidateHash(); - // Log to transaction state log, what was written - logSingletonWrite(getLabel(), value); } }