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.

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

Return created election when adding to active_transactions #2551

Merged
merged 3 commits into from
Feb 12, 2020

Commits on Feb 11, 2020

  1. This changes the signature of active_transactions::start to match STL…

    … container ::insert signatures by returning a pointer to the newly created election and also a bool whether the election creation took place.
    
    This allows the call site to retrieve the election that was inserted and determine if it was the initiator of the election creation.
    Also updated tests that were taking extra steps to retrieve the newly created election.
    clemahieu committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    a2fcd08 View commit details
    Browse the repository at this point in the history
  2. Renaming active_transactions::start/add to insert/insert_impl to more…

    … closely match the behavior that's expected.
    clemahieu committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    2d20d85 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. Merge branch 'develop' into return_election

    # Conflicts:
    #	nano/core_test/active_transactions.cpp
    #	nano/node/blockprocessor.cpp
    clemahieu committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    06eca06 View commit details
    Browse the repository at this point in the history