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

Jump to bottom

06302 - turn NodeId into a record containing a long #6370

Merged
merged 36 commits into from May 12, 2023
Merged

06302 - turn NodeId into a record containing a long #6370

merged 36 commits into from May 12, 2023

Commits on May 2, 2023

  1. 06302 - remove EventCreationRule from NodeId class declaration 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 2, 2023
    Configuration menu
    Copy the full SHA
    a0cd679 View commit details
    Browse the repository at this point in the history

  2. 06302 - incremental commit. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 2, 2023
    Configuration menu
    Copy the full SHA
    1d4c747 View commit details
    Browse the repository at this point in the history

  3. 06304 - NodeId is now a record 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 2, 2023
    Configuration menu
    Copy the full SHA
    e2d54d5 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long 

    # Conflicts:
#	platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventCreator.java
#	platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/creation/ChatterEventCreator.java
#	platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/state/SwirldStateManagerImplTests.java
    @edward-swirldslabs
    edward-swirldslabs committed May 3, 2023
    Configuration menu
    Copy the full SHA
    f9d7598 View commit details
    Browse the repository at this point in the history

  2. 06302 - commit after merging develop into branch 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 3, 2023
    Configuration menu
    Copy the full SHA
    bb931da View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    8f8c375 View commit details
    Browse the repository at this point in the history

  2. 06302 - removing mirror node NodeId unit test, no longer relevant. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    7cb884b View commit details
    Browse the repository at this point in the history

  3. 06302 - merge develop and spotless apply 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    f0507af View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    3e12c23 View commit details
    Browse the repository at this point in the history

  5. 06302 - Adding NodeId change used in the future. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    81b5e02 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long 

    # Conflicts:
#	platform-sdk/platform-apps/tests/PlatformTestingTool/src/test/java/com/swirlds/demo/platform/FCMQueryControllerTest.java
    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    eec8eaa View commit details
    Browse the repository at this point in the history

  7. 06302 - merge with accepting delete left husk of the file. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    9200f86 View commit details
    Browse the repository at this point in the history

  8. 06302 - fixing unit tests 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    fdc444b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    1a6c41c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 4, 2023
    Configuration menu
    Copy the full SHA
    65a08c2 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    64054e6 View commit details
    Browse the repository at this point in the history

  2. 06302 - Adding -1L NodeId as invalid marker. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    09cb931 View commit details
    Browse the repository at this point in the history

  3. 06302 - changing equals to matches on long values 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7fb933b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 5, 2023
    Configuration menu
    Copy the full SHA
    13b2fc4 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long 

    # Conflicts:
#	platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java
    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    7b1a617 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    92f3b29 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    d43a50e View commit details
    Browse the repository at this point in the history

  4. 06302 - updating names of FIRST_NODE_ID 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    63defad View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    7fd0ca2 View commit details
    Browse the repository at this point in the history

  6. 06302 - removing matches(long) method from NodeId. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    d03ae68 View commit details
    Browse the repository at this point in the history

  7. 06302 - removing use of negative node id in TopologyTest.java 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 8, 2023
    Configuration menu
    Copy the full SHA
    974a87b View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long 

    # Conflicts:
#	platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java
    @edward-swirldslabs
    edward-swirldslabs committed May 9, 2023
    Configuration menu
    Copy the full SHA
    15e75d6 View commit details
    Browse the repository at this point in the history

  2. 06302 - merge conflicts with develop 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 9, 2023
    Configuration menu
    Copy the full SHA
    e82e2ef View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long 

    # Conflicts:
#	platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java
    @edward-swirldslabs
    edward-swirldslabs committed May 11, 2023
    Configuration menu
    Copy the full SHA
    70e9f06 View commit details
    Browse the repository at this point in the history

  2. 06302 - code review findings, removing use of concurrent hashmap. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 11, 2023
    Configuration menu
    Copy the full SHA
    9ca8280 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long

    @edward-swirldslabs
    edward-swirldslabs committed May 11, 2023
    Configuration menu
    Copy the full SHA
    fd6e388 View commit details
    Browse the repository at this point in the history

  4. 06302 - code review finding, removing create method from NodeId.java 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 11, 2023
    Configuration menu
    Copy the full SHA
    ccd173b View commit details
    Browse the repository at this point in the history

  5. 06302 - removing unused variable. 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 11, 2023
    Configuration menu
    Copy the full SHA
    618a989 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge branch 'develop' into 06302-Turn-NodeId-into-record-of-a-long 

    # Conflicts:
#	platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/PlatformMetrics.java
#	platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/components/EventMapperTest.java
    @edward-swirldslabs
    edward-swirldslabs committed May 12, 2023
    Configuration menu
    Copy the full SHA
    2240a48 View commit details
    Browse the repository at this point in the history

  2. 06302 - processing merge conflicts 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 12, 2023
    Configuration menu
    Copy the full SHA
    7e6cb76 View commit details
    Browse the repository at this point in the history

  3. 06302 - spotlessApply 

    Signed-off-by: Edward Wertz <edward@swirldslabs.com>
    @edward-swirldslabs
    edward-swirldslabs committed May 12, 2023
    Configuration menu
    Copy the full SHA
    d8fa9c6 View commit details
    Browse the repository at this point in the history