Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: 16221 swirlds-state-impl module #16379

Merged
merged 11 commits into from
Nov 6, 2024
Merged

chore: 16221 swirlds-state-impl module #16379

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3ded424
chore: 16221 `swirlds-state-impl` module
imalygin Nov 1, 2024
4162af6
Moved test classes from `swirlds-state-api` to `swirlds-state-impl` m…
imalygin Nov 1, 2024
1f3affb
Added missing dependency.
imalygin Nov 1, 2024
596a659
Merge branch 'develop' into 16221-swirlds-state-impl
imalygin Nov 5, 2024
b9f6ed8
Fixed compilation errors.
imalygin Nov 5, 2024
a8ce1bb
Spotless
imalygin Nov 5, 2024
60087ff
Merge branch 'develop' into 16221-swirlds-state-impl
imalygin Nov 5, 2024
1a25e04
Addressed Artem's comment
imalygin Nov 5, 2024
bd23d36
Fixed module dependencies
imalygin Nov 5, 2024
ddb89c7
Spotless
imalygin Nov 6, 2024
e318f3e
Merge branch 'develop' into 16221-swirlds-state-impl
tinker-michaelj Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...pl/src/main/java/com/hedera/node/app/service/addressbook/impl/AddressBookServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.hedera.node.app.service.addressbook.AddressBookService;
import com.hedera.node.app.service.addressbook.impl.schemas.V053AddressBookSchema;
import com.hedera.node.app.spi.RpcService;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.merkle.SchemaRegistry;
import edu.umd.cs.findbugs.annotations.NonNull;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/com/hedera/node/app/service/addressbook/impl/schemas/V053AddressBookSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
import com.hedera.node.config.data.FilesConfig;
import com.hedera.pbj.runtime.ParseException;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.state.spi.MigrationContext;
import com.swirlds.state.merkle.MigrationContext;
import com.swirlds.state.merkle.Schema;
import com.swirlds.state.merkle.StateDefinition;
import com.swirlds.state.spi.ReadableKVState;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.spi.StateDefinition;
import com.swirlds.state.spi.WritableKVState;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/hedera/node/app/service/addressbook/impl/test/AddressBookServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import static org.mockito.Mockito.verify;

import com.hedera.node.app.service.addressbook.impl.AddressBookServiceImpl;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.merkle.SchemaRegistry;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand Down
6 changes: 3 additions & 3 deletions .../com/hedera/node/app/service/addressbook/impl/test/schemas/V053AddressBookSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
import com.hedera.node.app.spi.fixtures.util.LoggingTarget;
import com.hedera.node.config.testfixtures.HederaTestConfigBuilder;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.state.spi.MigrationContext;
import com.swirlds.state.spi.StateDefinition;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.merkle.MigrationContext;
import com.swirlds.state.merkle.StateDefinition;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.test.fixtures.MapWritableKVState;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.time.InstantSource;

/**
* Gives context to {@link com.swirlds.state.spi.Service} implementations on how the application workflows will do
* Gives context to {@link com.swirlds.state.merkle.Service} implementations on how the application workflows will do
* shared functions like verifying signatures or computing the current instant.
*/
public interface AppContext {
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/RpcService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.hedera.node.app.spi;

import com.hedera.pbj.runtime.RpcServiceDefinition;
import com.swirlds.state.spi.Service;
import com.swirlds.state.merkle.Service;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.Set;

Expand Down
5 changes: 2 additions & 3 deletions ...ra-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.hedera.node.app.spi.workflows;

import static com.hedera.node.app.spi.AppContext.*;
import static com.hedera.node.app.spi.workflows.HandleContext.TransactionCategory.SCHEDULED;

import com.hedera.hapi.node.base.AccountID;
Expand All @@ -37,8 +36,8 @@
import com.hedera.node.app.spi.workflows.record.ExternalizedRecordCustomizer;
import com.hedera.node.app.spi.workflows.record.StreamBuilder;
import com.swirlds.config.api.Configuration;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.time.Instant;
Expand Down
2 changes: 1 addition & 1 deletion ...ra-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.hedera.hapi.node.transaction.TransactionBody;
import com.swirlds.config.api.Configuration;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.merkle.info.NetworkInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.time.Instant;

Expand Down
1 change: 1 addition & 0 deletions hedera-node/hedera-app-spi/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
requires transitive com.swirlds.common;
requires transitive com.swirlds.config.api;
requires transitive com.swirlds.state.api;
requires transitive com.swirlds.state.impl;
requires transitive com.hedera.pbj.runtime;
requires static com.github.spotbugs.annotations;

Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app-spi/src/test/java/com/hedera/node/app/spi/state/SchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.hedera.hapi.node.base.SemanticVersion;
import com.hedera.node.app.spi.fixtures.state.MapWritableStates;
import com.swirlds.platform.test.fixtures.state.TestSchema;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.merkle.Schema;
import com.swirlds.state.test.fixtures.StateTestBase;
import java.util.ArrayList;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...-node/hedera-app-spi/src/test/java/com/hedera/node/app/spi/state/StateDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import static org.junit.jupiter.api.Assertions.*;

import com.hedera.pbj.runtime.Codec;
import com.swirlds.state.spi.StateDefinition;
import com.swirlds.state.merkle.StateDefinition;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
Expand Down
6 changes: 3 additions & 3 deletions ...de/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import com.hedera.node.app.hapi.utils.ethereum.EthTxData;
import com.swirlds.platform.test.fixtures.state.TestSchema;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.spi.Service;
import com.swirlds.state.merkle.Schema;
import com.swirlds.state.merkle.SchemaRegistry;
import com.swirlds.state.merkle.Service;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/info/FakeNetworkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.common.platform.NodeId;
import com.swirlds.state.State;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions hedera-node/hedera-app-spi/src/testFixtures/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
requires transitive com.swirlds.platform.core.test.fixtures;
requires transitive com.swirlds.state.api.test.fixtures;
requires transitive com.swirlds.state.api;
requires transitive com.swirlds.state.impl;
requires transitive com.hedera.pbj.runtime;
requires transitive org.apache.logging.log4j;
requires transitive org.assertj.core;
Expand Down
2 changes: 2 additions & 0 deletions hedera-node/hedera-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ testModuleInfo {
requires("com.swirlds.common.test.fixtures")
requires("com.swirlds.platform.core.test.fixtures")
requires("com.swirlds.state.api.test.fixtures")
requires("com.swirlds.state.impl.test.fixtures")
requires("com.swirlds.base.test.fixtures")
requires("headlong")
requires("org.assertj.core")
Expand Down Expand Up @@ -79,6 +80,7 @@ jmhModuleInfo {
requires("com.swirlds.metrics.api")
requires("com.swirlds.platform.core")
requires("com.swirlds.state.api")
requires("com.swirlds.state.impl")
requires("jmh.core")
}

Expand Down
2 changes: 1 addition & 1 deletion ...-node/hedera-app/src/jmh/java/com/hedera/node/app/blocks/BlockStreamManagerBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import com.swirlds.platform.system.Round;
import com.swirlds.platform.system.events.ConsensusEvent;
import com.swirlds.platform.system.state.notifications.StateHashedNotification;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.merkle.Schema;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.io.ByteArrayOutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...ra-node/hedera-app/src/jmh/java/com/hedera/node/app/blocks/StandaloneRoundManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import com.swirlds.platform.system.Round;
import com.swirlds.platform.system.events.ConsensusEvent;
import com.swirlds.platform.system.state.notifications.StateHashedNotification;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.merkle.Schema;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app/src/main/java/com/hedera/node/app/Hedera.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
import com.swirlds.platform.system.transaction.Transaction;
import com.swirlds.state.State;
import com.swirlds.state.StateChangeListener;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.spi.WritableSingletonStateBase;
import com.swirlds.state.spi.info.NetworkInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.nio.charset.Charset;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/HederaInjectionComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
import com.swirlds.platform.system.InitTrigger;
import com.swirlds.platform.system.Platform;
import com.swirlds.state.State;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import dagger.BindsInstance;
import dagger.Component;
import java.nio.charset.Charset;
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/BlockStreamModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.hedera.node.app.blocks.impl.GrpcBlockItemWriter;
import com.hedera.node.config.ConfigProvider;
import com.hedera.node.config.data.BlockStreamConfig;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import dagger.Binds;
import dagger.Module;
import dagger.Provides;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/BlockStreamService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import com.hedera.node.app.blocks.schemas.V0560BlockStreamSchema;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.spi.Service;
import com.swirlds.state.merkle.SchemaRegistry;
import com.swirlds.state.merkle.Service;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.Optional;
Expand Down
4 changes: 2 additions & 2 deletions ...ra-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/FileBlockItemWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.hedera.node.app.blocks.impl;

import static com.swirlds.state.spi.HapiUtils.asAccountString;
import static com.swirlds.state.merkle.HapiUtils.asAccountString;
import static java.util.Objects.requireNonNull;

import com.hedera.hapi.block.stream.schema.BlockSchema;
Expand All @@ -27,7 +27,7 @@
import com.hedera.pbj.runtime.ProtoWriterTools;
import com.hedera.pbj.runtime.io.buffer.BufferedData;
import com.hedera.pbj.runtime.io.stream.WritableStreamingData;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.BufferedOutputStream;
import java.io.IOException;
Expand Down
6 changes: 3 additions & 3 deletions ...e/hedera-app/src/main/java/com/hedera/node/app/blocks/schemas/V0560BlockStreamSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import com.hedera.hapi.node.state.blockstream.BlockStreamInfo;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.config.api.Configuration;
import com.swirlds.state.spi.MigrationContext;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.spi.StateDefinition;
import com.swirlds.state.merkle.MigrationContext;
import com.swirlds.state.merkle.Schema;
import com.swirlds.state.merkle.StateDefinition;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.Set;
import java.util.function.Consumer;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.hedera.node.app.fees;

import com.hedera.node.app.fees.schemas.V0490FeeSchema;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.spi.Service;
import com.swirlds.state.merkle.SchemaRegistry;
import com.swirlds.state.merkle.Service;
import edu.umd.cs.findbugs.annotations.NonNull;

public class FeeService implements Service {
Expand Down
6 changes: 3 additions & 3 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/schemas/V0490FeeSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import com.hedera.hapi.node.transaction.ExchangeRate;
import com.hedera.hapi.node.transaction.ExchangeRateSet;
import com.hedera.node.config.data.BootstrapConfig;
import com.swirlds.state.spi.MigrationContext;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.spi.StateDefinition;
import com.swirlds.state.merkle.MigrationContext;
import com.swirlds.state.merkle.Schema;
import com.swirlds.state.merkle.StateDefinition;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.Set;

Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/ids/EntityIdService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.hedera.node.app.ids;

import com.hedera.node.app.ids.schemas.V0490EntityIdSchema;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.spi.Service;
import com.swirlds.state.merkle.SchemaRegistry;
import com.swirlds.state.merkle.Service;
import edu.umd.cs.findbugs.annotations.NonNull;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...ra-node/hedera-app/src/main/java/com/hedera/node/app/ids/schemas/V0490EntityIdSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import com.hedera.hapi.node.base.SemanticVersion;
import com.hedera.hapi.node.state.common.EntityNumber;
import com.hedera.node.config.data.HederaConfig;
import com.swirlds.state.spi.MigrationContext;
import com.swirlds.state.merkle.MigrationContext;
import com.swirlds.state.merkle.Schema;
import com.swirlds.state.merkle.StateDefinition;
import com.swirlds.state.spi.ReadableStates;
import com.swirlds.state.spi.Schema;
import com.swirlds.state.spi.StateDefinition;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.util.Set;
import org.apache.logging.log4j.LogManager;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/GenesisNetworkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import com.hedera.hapi.node.state.roster.RosterEntry;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.state.State;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.LinkedHashMap;
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/InfoInjectionModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.hedera.hapi.node.base.AccountID;
import com.hedera.node.app.annotations.NodeSelfId;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import dagger.Module;
import dagger.Provides;
import edu.umd.cs.findbugs.annotations.NonNull;
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/NodeInfoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.hedera.hapi.node.state.addressbook.Node;
import com.hedera.hapi.node.state.roster.RosterEntry;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/StateNetworkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import com.swirlds.platform.state.service.PlatformStateService;
import com.swirlds.platform.state.service.ReadablePlatformStateStore;
import com.swirlds.state.State;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import com.swirlds.state.spi.ReadableKVState;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.spi.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.LinkedHashMap;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/UnavailableNetworkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import com.hedera.hapi.node.state.roster.Roster;
import com.hedera.pbj.runtime.io.buffer.Bytes;
import com.swirlds.state.State;
import com.swirlds.state.spi.info.NetworkInfo;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NetworkInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/BlockRecordService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import com.hedera.node.app.records.impl.BlockRecordManagerImpl;
import com.hedera.node.app.records.schemas.V0490BlockRecordSchema;
import com.hedera.node.app.records.schemas.V0560BlockRecordSchema;
import com.swirlds.state.spi.SchemaRegistry;
import com.swirlds.state.spi.Service;
import com.swirlds.state.merkle.SchemaRegistry;
import com.swirlds.state.merkle.Service;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.inject.Singleton;

Expand Down
2 changes: 1 addition & 1 deletion ...java/com/hedera/node/app/records/impl/producers/formats/BlockRecordWriterFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.hedera.node.config.ConfigProvider;
import com.hedera.node.config.data.BlockRecordStreamConfig;
import com.swirlds.common.stream.Signer;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.nio.file.FileSystem;
import javax.inject.Inject;
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/com/hedera/node/app/records/impl/producers/formats/v6/BlockRecordWriterV6.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import static com.hedera.pbj.runtime.ProtoWriterTools.writeLong;
import static com.hedera.pbj.runtime.ProtoWriterTools.writeMessage;
import static com.swirlds.common.stream.LinkedObjectStreamUtilities.convertInstantToStringWithPadding;
import static com.swirlds.state.spi.HapiUtils.asAccountString;
import static com.swirlds.state.merkle.HapiUtils.asAccountString;
import static java.util.Objects.requireNonNull;

import com.hedera.hapi.node.base.SemanticVersion;
Expand All @@ -46,7 +46,7 @@
import com.swirlds.common.crypto.DigestType;
import com.swirlds.common.crypto.HashingOutputStream;
import com.swirlds.common.stream.Signer;
import com.swirlds.state.spi.info.NodeInfo;
import com.swirlds.state.merkle.info.NodeInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.BufferedOutputStream;
import java.io.IOException;
Expand Down
Loading
Loading