diff --git a/hapi/hedera-protobufs/services/state/roster/roster.proto b/hapi/hedera-protobufs/services/state/roster/roster.proto index 3d822062643b..d6b7f6ab1af7 100644 --- a/hapi/hedera-protobufs/services/state/roster/roster.proto +++ b/hapi/hedera-protobufs/services/state/roster/roster.proto @@ -37,7 +37,7 @@ message Roster { * This list SHALL contain roster entries in natural order of ascending node ids. * This list SHALL NOT be empty.
*/ - repeated RosterEntry rosters = 1; + repeated RosterEntry roster_entries = 1; } /** diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterRetriever.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterRetriever.java index bbf288a20a3a..dc8851fa5b1e 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterRetriever.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterRetriever.java @@ -147,7 +147,7 @@ public static long getRound(@NonNull final State state) { @NonNull public static Roster buildRoster(@NonNull final AddressBook addressBook) { return Roster.newBuilder() - .rosters(addressBook.getNodeIdSet().stream() + .rosterEntries(addressBook.getNodeIdSet().stream() .map(addressBook::getAddress) .map(address -> { try { diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterValidator.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterValidator.java index 8b88b95f13d8..1d931014dac9 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterValidator.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/roster/RosterValidator.java @@ -41,7 +41,7 @@ public static void validate(@NonNull final Roster roster) { throw new InvalidRosterException("roster is null"); } - final List rosterEntries = roster.rosters(); + final List rosterEntries = roster.rosterEntries(); if (rosterEntries.isEmpty()) { throw new InvalidRosterException("roster is empty"); diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/address/AddressBookUtils.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/address/AddressBookUtils.java index 4cf817fecc50..1d4be49cfff3 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/address/AddressBookUtils.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/address/AddressBookUtils.java @@ -343,7 +343,7 @@ public static Roster createRoster(@NonNull final AddressBook bootstrapAddressBoo final RosterEntry rosterEntry = AddressBookUtils.toRosterEntry(address, nodeId); rosterEntries.add(rosterEntry); } - return Roster.newBuilder().rosters(rosterEntries).build(); + return Roster.newBuilder().rosterEntries(rosterEntries).build(); } /** diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterRetrieverTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterRetrieverTests.java index 7a35d468968f..51671c0705b6 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterRetrieverTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterRetrieverTests.java @@ -108,7 +108,7 @@ public class RosterRetrieverTests { .build(); private static final Roster ROSTER_FROM_ADDRESS_BOOK = Roster.newBuilder() - .rosters(List.of( + .rosterEntries(List.of( RosterEntry.newBuilder() .nodeId(1L) .weight(1L) diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterValidatorTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterValidatorTests.java index b5d9da5b7813..38edd21a1e64 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterValidatorTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/roster/RosterValidatorTests.java @@ -43,7 +43,7 @@ void zeroWeightTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(0) @@ -83,7 +83,7 @@ void negativeWeightTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(0) @@ -123,7 +123,7 @@ void duplicateNodeIdTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -163,7 +163,7 @@ void invalidGossipCertTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -203,7 +203,7 @@ void emptyGossipEndpointsTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -239,7 +239,7 @@ void zeroPortTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -281,7 +281,7 @@ void domainAndIpTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -324,7 +324,7 @@ void wrongNodeIdOrderTest() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -364,7 +364,7 @@ void invalidIPv4Test() { final Exception ex = assertThrows( InvalidRosterException.class, () -> RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) @@ -404,7 +404,7 @@ void invalidIPv4Test() { @Test void validTest() { RosterValidator.validate(Roster.newBuilder() - .rosters( + .rosterEntries( RosterEntry.newBuilder() .nodeId(1) .weight(1) diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/util/AddressBookNetworkUtilsTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/util/AddressBookNetworkUtilsTests.java index 89c4fa4f7ce9..5d5e6ae72e5a 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/util/AddressBookNetworkUtilsTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/util/AddressBookNetworkUtilsTests.java @@ -110,9 +110,9 @@ void testCreateRosterFromNonEmptyAddressBook() { final Roster roster = AddressBookUtils.createRoster(addressBook); assertNotNull(roster); - assertEquals(2, roster.rosters().size()); - assertEquals(1L, roster.rosters().getFirst().nodeId()); - assertEquals(2L, roster.rosters().getLast().nodeId()); + assertEquals(2, roster.rosterEntries().size()); + assertEquals(1L, roster.rosterEntries().getFirst().nodeId()); + assertEquals(2L, roster.rosterEntries().getLast().nodeId()); } @Test @@ -136,7 +136,7 @@ void testCreateRosterFromEmptyAddressBook() { final Roster roster = AddressBookUtils.createRoster(addressBook); assertNotNull(roster); - assertTrue(roster.rosters().isEmpty()); + assertTrue(roster.rosterEntries().isEmpty()); } @Test @@ -148,7 +148,7 @@ void testToRosterEntryWithCertificateEncodingException() throws CertificateEncod final AddressBook addressBook = new AddressBook(List.of(address)); final Roster roster = AddressBookUtils.createRoster(addressBook); - assertEquals(Bytes.EMPTY, roster.rosters().getFirst().gossipCaCertificate()); + assertEquals(Bytes.EMPTY, roster.rosterEntries().getFirst().gossipCaCertificate()); } @Test @@ -157,10 +157,10 @@ void testToRosterEntryWithExternalHostname() { final AddressBook addressBook = new AddressBook(List.of(address)); final Roster roster = AddressBookUtils.createRoster(addressBook); - assertEquals(1, roster.rosters().size()); + assertEquals(1, roster.rosterEntries().size()); assertEquals( "hostnameExternal", - roster.rosters().getFirst().gossipEndpoint().getFirst().domainName()); + roster.rosterEntries().getFirst().gossipEndpoint().getFirst().domainName()); } @Test @@ -169,10 +169,10 @@ void testToRosterEntryWithInternalHostname() { final AddressBook addressBook = new AddressBook(List.of(address)); final Roster roster = AddressBookUtils.createRoster(addressBook); - assertEquals(1, roster.rosters().size()); + assertEquals(1, roster.rosterEntries().size()); assertEquals( "hostnameInternal", - roster.rosters().getFirst().gossipEndpoint().getFirst().domainName()); + roster.rosterEntries().getFirst().gossipEndpoint().getFirst().domainName()); } @Test