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

Bundle messages at broadcast #4436

Merged
merged 29 commits into from Aug 31, 2020

Commits on Aug 24, 2020

  1. Refactoring

    chimp1984 committed Aug 24, 2020
    Copy the full SHA
    badc872 View commit details
    Browse the repository at this point in the history
  2. Refactoring

    chimp1984 committed Aug 24, 2020
    Copy the full SHA
    c493282 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Bundle broadcast requests

    chimp1984 committed Aug 26, 2020
    Copy the full SHA
    5433707 View commit details
    Browse the repository at this point in the history
  2. Add todo and curly brackets

    chimp1984 committed Aug 26, 2020
    Copy the full SHA
    06f407f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    ea50ce8 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    b8152d6 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    04b6c2a View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    8747da4 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    f67a467 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    c6c56b3 View commit details
    Browse the repository at this point in the history
  9. Add logs

    chimp1984 committed Aug 26, 2020
    Copy the full SHA
    d59a3ad View commit details
    Browse the repository at this point in the history
  10. Remove TODO

    chimp1984 committed Aug 26, 2020
    Copy the full SHA
    d8da20a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. Copy the full SHA
    bef4700 View commit details
    Browse the repository at this point in the history
  2. - Add shutdown handling to broadCaster.

    It is important that we flush our queued requests
    at shutdown and wait until broadcast is completed as a maker need to
    remove his offers at shutdown.
    
    - Add handling for the case that there are very few connections (as in
    dev setup).
    
    - Make BundleOfEnvelopes extend BroadcastMessage
    
    - Add complete handler for broadCaster to shutdown in P2PService and
    wait with shutdown of other services until broadcaster is completed.
    - Remove case for repeated shutdown call on P2PService as it cannot
    happen.
    chimp1984 committed Aug 27, 2020
    Copy the full SHA
    b1702f7 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e780d49 View commit details
    Browse the repository at this point in the history
  4. Fix log

    chimp1984 committed Aug 27, 2020
    Copy the full SHA
    6270527 View commit details
    Browse the repository at this point in the history
  5. Remove dev logs

    chimp1984 committed Aug 27, 2020
    Copy the full SHA
    21ff2df View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    0e8704e View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. Satisfy annoying Codacy bot

    chimp1984 committed Aug 28, 2020
    Copy the full SHA
    28a665e View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    c535ebb View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2020

  1. Merge branch 'master_upstream' into bundle-msg-at-broadcast

    # Conflicts:
    #	p2p/src/main/java/bisq/network/p2p/P2PService.java
    chimp1984 committed Aug 29, 2020
    Copy the full SHA
    be78770 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/bundle-msg-at-broadcast' into bu…

    …ndle-msg-at-broadcast
    
    # Conflicts:
    #	p2p/src/main/java/bisq/network/p2p/P2PService.java
    chimp1984 committed Aug 29, 2020
    Copy the full SHA
    366fdb3 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b0eea78 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. Merge branch 'master_upstream' into bundle-msg-at-broadcast

    # Conflicts:
    #	p2p/src/main/java/bisq/network/p2p/P2PService.java
    chimp1984 committed Aug 30, 2020
    Copy the full SHA
    6accd58 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    0aa97d3 View commit details
    Browse the repository at this point in the history
  3. Add comment about size

    chimp1984 committed Aug 30, 2020
    Copy the full SHA
    8d13ff8 View commit details
    Browse the repository at this point in the history
  4. Fix tests.

    I don't know why the tests failed as I just added an overloaded method
    and it should not have any impact. There is also one exception which
    makes it even more obscure. I guess its some test framework issue.
    
    See comment at the exceptional handling
    // If we remove the last argument (isNull()) tests fail. No idea why as the broadcast method has an
    / overloaded method with nullable listener. Seems a testframework issue as it should not matter if the
    // method with listener is called with null argument or the other method with no listener. We removed the
    // null value from all other calls but here we can't as it breaks the test.
    chimp1984 committed Aug 30, 2020
    Copy the full SHA
    49d212e View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. Copy the full SHA
    bc802c8 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f7951d5 View commit details
    Browse the repository at this point in the history