Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

Batch Import Addresses to 1.5.0 #4040

Merged
merged 5 commits into from
Jan 31, 2019

Conversation

KtorZ
Copy link
Contributor

@KtorZ KtorZ commented Jan 28, 2019

Description

Backporting cardano-foundation/cardano-wallet#259 to 1.5.0

Linked issue

Type of change

  • 🐞 Bug fix (non-breaking change which fixes an issue)
  • 🛠 New feature (non-breaking change which adds functionality)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)
  • 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc
  • 🔨 New or improved tests for existing code
  • ⛑ git-flow chore (backport, hotfix, etc)

Developer checklist

  • I have read the style guide document, and my code follows the code style of this project.
  • If my code deals with exceptions, it follows the guidelines.
  • I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on cardanodocs.com, amending the inline Haddock comments, any relevant README file or one of the document listed in the docs directory.
  • CHANGELOG entry has been added and is linked to the correct PR on GitHub.

Testing checklist

  • I have added tests to cover my changes.
  • All new and existing tests passed.

QA Steps

Screenshots (if available)

How to merge

Send the message bors r+ to merge this PR. For more information, see
docs/how-to/bors.md.

@KtorZ KtorZ self-assigned this Jan 28, 2019
@KtorZ KtorZ requested a review from deepfire January 28, 2019 20:26
@KtorZ KtorZ changed the title Ktor z/258/batch import address 1.5.0 Batch Import Addresses | → 1.5.0 Jan 28, 2019
@KtorZ KtorZ changed the title Batch Import Addresses | → 1.5.0 Batch Import Addresses→ 1.5.0 Jan 28, 2019
@KtorZ KtorZ changed the title Batch Import Addresses→ 1.5.0 Batch Import Addresses → 1.5.0 Jan 28, 2019
@deepfire
Copy link
Contributor

@KtorZ, do you think it might make sense getting the property tests into the same PR as well?

@deepfire
Copy link
Contributor

cc @cleverca22

@disassembler disassembler changed the title Batch Import Addresses → 1.5.0 Batch Import Addresses to 1.5.0 Jan 29, 2019
@KtorZ KtorZ mentioned this pull request Jan 29, 2019
12 tasks
@KtorZ
Copy link
Contributor Author

KtorZ commented Jan 29, 2019

@cleverca22 If ever, don't trigger bors. I'd like to add some bits to the CHANGELOG and the API doc before merging.

@tatyanavych
Copy link
Contributor

Please add the CHANGELOG entry

@KtorZ
Copy link
Contributor Author

KtorZ commented Jan 30, 2019

@tatyanavych ... Thanks for being thoughtful here but please, have a look at my last comment:

#4040 (comment)

Thank you 🙏

@KtorZ
Copy link
Contributor Author

KtorZ commented Jan 30, 2019

bors r+

1 similar comment
@KtorZ
Copy link
Contributor Author

KtorZ commented Jan 30, 2019

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

Not awaiting review

@KtorZ
Copy link
Contributor Author

KtorZ commented Jan 30, 2019

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

Not awaiting review

@KtorZ
Copy link
Contributor Author

KtorZ commented Jan 30, 2019

I hate you bors. You're not my friend anymore.

@disassembler
Copy link
Contributor

bors ping

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

pong

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

Merge conflict (retrying...)

iohk-bors bot added a commit that referenced this pull request Jan 30, 2019
4003: CBR-499: Extend LastBksSlots data type and storage for OBFT r=mhuesch a=erikd

## Description

Keep the hash of the public key used to sign each block for the last `k` blocks as required by the OBFT protocol.

## Linked issue

https://iohk.myjetbrains.com/youtrack/issue/CBR-499


4040: Batch Import Addresses to 1.5.0 r=KtorZ a=KtorZ

## Description

<!--- A brief description of this PR and the problem is trying to solve -->

Backporting cardano-foundation/cardano-wallet#259 to 1.5.0


## Linked issue

<!--- Put here the relevant issue from YouTrack -->



Co-authored-by: Erik de Castro Lopo <[email protected]>
Co-authored-by: KtorZ <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

Timed out (retrying...)

@disassembler
Copy link
Contributor

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

Not awaiting review

@disassembler
Copy link
Contributor

bors r-

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 30, 2019

Canceled

@disassembler
Copy link
Contributor

bors r+ p=9

iohk-bors bot added a commit that referenced this pull request Jan 31, 2019
4040: Batch Import Addresses to 1.5.0 r=disassembler a=KtorZ

## Description

<!--- A brief description of this PR and the problem is trying to solve -->

Backporting cardano-foundation/cardano-wallet#259 to 1.5.0


## Linked issue

<!--- Put here the relevant issue from YouTrack -->



Co-authored-by: KtorZ <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jan 31, 2019

@iohk-bors iohk-bors bot merged commit a7447b4 into develop Jan 31, 2019
@iohk-bors iohk-bors bot deleted the KtorZ/258/batch-import-address-1.5.0 branch January 31, 2019 02:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants