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

chore: merge branch 'main' into 0.3.0-pre #1030

Merged

Conversation

genaris
Copy link
Contributor

@genaris genaris commented Sep 16, 2022

Merging 0.2.3 and 0.2.4 features into 0.3.x branch:

  • All tests pass
  • Demo works
  • Action Menu module was added to the core for the moment

Hope to not have missed anything. Please double check!

Iskander508 and others added 14 commits August 29, 2022 16:45
Signed-off-by: Pavel Zarecky <zarecky@procivis.ch>
Signed-off-by: conanoc <conanoc@gmail.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Timo Glastra <timo@animo.id>
…reconnection (openwallet-foundation#1017)

Signed-off-by: Sergi Garreta <sergi.garreta@entrust.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Ariel Gentile <gentilester@gmail.com>
Signed-off-by: Ariel Gentile <gentilester@gmail.com>
@genaris genaris marked this pull request as ready for review September 16, 2022 20:14
@genaris genaris requested a review from a team as a code owner September 16, 2022 20:14
@codecov-commenter
Copy link

codecov-commenter commented Sep 16, 2022

Codecov Report

Merging #1030 (ea2a390) into 0.3.0-pre (991151b) will increase coverage by 0.43%.
The diff coverage is 87.62%.

@@              Coverage Diff              @@
##           0.3.0-pre    #1030      +/-   ##
=============================================
+ Coverage      87.80%   88.24%   +0.43%     
=============================================
  Files            644      680      +36     
  Lines          15225    15873     +648     
  Branches        2467     2548      +81     
=============================================
+ Hits           13369    14007     +638     
- Misses          1851     1861      +10     
  Partials           5        5              
Impacted Files Coverage Δ
packages/core/src/agent/helpers.ts 100.00% <ø> (ø)
...es/core/src/decorators/service/ServiceDecorator.ts 100.00% <ø> (ø)
.../connections/handlers/ConnectionResponseHandler.ts 82.85% <ø> (ø)
...modules/connections/repository/ConnectionRecord.ts 95.65% <ø> (ø)
...ges/core/src/modules/credentials/CredentialsApi.ts 87.73% <0.00%> (-0.84%) ⬇️
.../methods/peer/createPeerDidDocumentFromServices.ts 96.42% <ø> (ø)
packages/core/src/modules/proofs/ProofsApi.ts 83.90% <0.00%> (-0.98%) ⬇️
packages/core/src/transport/WsOutboundTransport.ts 9.09% <0.00%> (-0.14%) ⬇️
packages/core/src/types.ts 100.00% <ø> (ø)
packages/core/src/utils/validators.ts 60.71% <0.00%> (ø)
... and 85 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Ariel Gentile <gentilester@gmail.com>
@genaris genaris changed the title 0.3.0 pre merge with main Merge branch 'main' into 0.3.0-pre Sep 20, 2022
sairanjit and others added 6 commits September 24, 2022 09:41
Signed-off-by: Sai Ranjit Tummalapalli <sairanjit5@gmail.com>
Signed-off-by: KolbyRKunz <KolbyKunz@yahoo.com>
Signed-off-by: Ariel Gentile <gentilester@gmail.com>
Signed-off-by: Ariel Gentile <gentilester@gmail.com>
@TimoGlastra TimoGlastra changed the title Merge branch 'main' into 0.3.0-pre chore: merge branch 'main' into 0.3.0-pre Oct 6, 2022
Comment on lines +323 to +332
/*testLogger.test('Alice selects menu item')
await aliceAgent.actionMenu.performAction({
connectionId: aliceConnection.id,
performedAction: { name: 'option-1' },
})

testLogger.test('Faber waits for menu selection from Alice')
await waitForActionMenuRecord(faberAgent, {
state: ActionMenuState.Done,
})*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be uncommented? Otherwise we can remove it I think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I've noticed this in main branch. Not sure why those commented lines remained there, but I'll check.

How do you think this PR should be merged? Should it be a merge commit or a squashed one as regular PRs? If the first approach is taken, maybe I can leave this work for the further action-menu modularisation task (in order to not add more commits here)

Copy link
Contributor

@TimoGlastra TimoGlastra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One comment, but otherwise looks good to me! Thanks for doing this @genaris!

@TimoGlastra
Copy link
Contributor

It seems DCO is failing. I think I could bypass, but worried that it will cause issues when we merge 0.3.0 into main

@genaris
Copy link
Contributor Author

genaris commented Oct 6, 2022

It seems DCO is failing. I think I could bypass, but worried that it will cause issues when we merge 0.3.0 into main

Yes, it's something that annoys me too. Do you know why it happens, since the original commits were correctly signed-off (or at least somehow passed it at that time)?

Probably, if DCO keeps failing, we can rebase this branch just before merging it into main. I don't want to do it now because I'm afraid that it will break some ongoing PRs, but I'm not an expert on this... I wanted to keep using SVN! 😝

@genaris
Copy link
Contributor Author

genaris commented Oct 10, 2022

Allright, I've re-updated this branch to match current 0.3.0-pre and main and did some local tests: first, I've created a PR of this branch against my 0.3.0-pre (using squash & merge), and then a PR from my 0.3.0-pre to my main. Results of a potential merge into main can be seen in https://github.com/2060-io/aries-framework-javascript/commits/main-merged. Not so bad: just a few extra Merge commits and the commit history is mostly fine.

I couldn't test the DCO issue (maybe we could create copies of 0.3.0-pre and main in hyperledger repo to do a final test). However, as far as I can see, in #965 there was already a DCO issue that you set to pass with the magic button and currently 0.3.0-pre branch is fine.

@TimoGlastra TimoGlastra merged commit 34658b0 into openwallet-foundation:0.3.0-pre Oct 11, 2022
@genaris genaris deleted the 0.3.0-pre-merge-with-main branch October 13, 2022 20:16
genaris added a commit to 2060-io/aries-framework-javascript that referenced this pull request Oct 13, 2022
* feat: OOB public did (openwallet-foundation#930)

Signed-off-by: Pavel Zarecky <zarecky@procivis.ch>

* feat(routing): manual mediator pickup lifecycle management (openwallet-foundation#989)

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* docs(demo): faber creates invitation (openwallet-foundation#995)

Signed-off-by: conanoc <conanoc@gmail.com>

* chore(release): v0.2.3 (openwallet-foundation#999)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(question-answer): question answer protocol state/role check (openwallet-foundation#1001)

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* feat: Action Menu protocol (Aries RFC 0509) implementation (openwallet-foundation#974)

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* fix(ledger): remove poolConnected on pool close (openwallet-foundation#1011)

Signed-off-by: Niall Shaw <niall.shaw@absa.africa>

* fix(ledger): check taa version instad of aml version (openwallet-foundation#1013)

Signed-off-by: Jakub Koci <jakub.koci@gmail.com>

* chore: add @janrtvld to maintainers (openwallet-foundation#1016)

Signed-off-by: Timo Glastra <timo@animo.id>

* feat(routing): add settings to control back off strategy on mediator reconnection (openwallet-foundation#1017)

Signed-off-by: Sergi Garreta <sergi.garreta@entrust.com>

* fix: avoid crash when an unexpected message arrives (openwallet-foundation#1019)

Signed-off-by: Pavel Zarecky <zarecky@procivis.ch>

* chore(release): v0.2.4 (openwallet-foundation#1024)

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* style: fix some lint errors

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* feat: use did:key flag (openwallet-foundation#1029)

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* ci: set default rust version (openwallet-foundation#1036)

Signed-off-by: Sai Ranjit Tummalapalli <sairanjit5@gmail.com>

* fix(oob): allow encoding in content type header (openwallet-foundation#1037)

Signed-off-by: Timo Glastra <timo@animo.id>

* feat: connection type (openwallet-foundation#994)

Signed-off-by: KolbyRKunz <KolbyKunz@yahoo.com>

* chore(module-tenants): match package versions

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* feat: improve sending error handling (openwallet-foundation#1045)

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

* feat: expose findAllByQuery method in modules and services (openwallet-foundation#1044)

Signed-off-by: Jim Ezesinachi <jim@animo.id>

* feat: possibility to set masterSecretId inside of WalletConfig (openwallet-foundation#1043)

Signed-off-by: Andrii Uhryn <an.ugryn@gmail.com>

* fix(oob): set connection alias when creating invitation (openwallet-foundation#1047)

Signed-off-by: Jakub Koci <jakub.koci@gmail.com>

* build: fix missing parameter

Signed-off-by: Ariel Gentile <gentilester@gmail.com>

Signed-off-by: Pavel Zarecky <zarecky@procivis.ch>
Signed-off-by: Ariel Gentile <gentilester@gmail.com>
Signed-off-by: conanoc <conanoc@gmail.com>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Niall Shaw <niall.shaw@absa.africa>
Signed-off-by: Jakub Koci <jakub.koci@gmail.com>
Signed-off-by: Timo Glastra <timo@animo.id>
Signed-off-by: Sergi Garreta <sergi.garreta@entrust.com>
Signed-off-by: Sai Ranjit Tummalapalli <sairanjit5@gmail.com>
Signed-off-by: KolbyRKunz <KolbyKunz@yahoo.com>
Signed-off-by: Jim Ezesinachi <jim@animo.id>
Signed-off-by: Andrii Uhryn <an.ugryn@gmail.com>
Co-authored-by: Iskander508 <pavel.zarecky@seznam.cz>
Co-authored-by: conanoc <conanoc@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Niall Shaw <100220424+niallshaw-absa@users.noreply.github.com>
Co-authored-by: jakubkoci <jakub.koci@gmail.com>
Co-authored-by: Timo Glastra <timo@animo.id>
Co-authored-by: Sergi Garreta Serra <garretaserra@gmail.com>
Co-authored-by: Sai Ranjit Tummalapalli <34263716+sairanjit@users.noreply.github.com>
Co-authored-by: KolbyRKunz <KolbyKunz@yahoo.com>
Co-authored-by: Jim Ezesinachi <ezesinachijim@gmail.com>
Co-authored-by: an-uhryn <55444541+an-uhryn@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.