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

Pki - migrate to junit 5 #6235

Merged
merged 7 commits into from
Dec 7, 2023
Merged

Pki - migrate to junit 5 #6235

merged 7 commits into from
Dec 7, 2023

Conversation

macfarla
Copy link
Contributor

@macfarla macfarla commented Dec 5, 2023

fixes #5560

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 5, 2023

  • I thought about documentation and added the doc-change-required label to this PR if updates are required.
  • I thought about the changelog and included a changelog update if required.
  • If my PR includes database changes (e.g. KeyValueSegmentIdentifier) I have thought about compatibility and performed forwards and backwards compatibility tests

jframe
jframe reviewed Dec 6, 2023
View reviewed changes
pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapperTest.java Outdated
@@ -158,7 +159,7 @@ public void getCertificateChain() throws Exception {
when(keyStore.getCertificateChain(CERTIFICATE_ALIAS))
.thenReturn(new Certificate[] {certificate});

assertThat(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS)).hasSize(1);
assertEquals(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS), 1);
Copy link
Contributor

Choose a reason for hiding this comment

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

This is comparing an array of Certificate with an int. The original assertion using hasSize is the correct thing to do

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapperTest.java Outdated
@@ -171,7 +172,7 @@ public void getCertificateChainFallbackToTrustStore() throws Exception {
when(trustStore.getCertificateChain(CERTIFICATE_ALIAS))
.thenReturn(new Certificate[] {certificate});

assertThat(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS)).hasSize(1);
assertEquals(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS), 1);
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be using hasSize or similar so we check the array size and not compare Certificate[] with an int

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapperTest.java Outdated
// CA -> INTERCA -> PARTNERACA -> VALIDATOR
assertThat(loadedKeyStore.getCertificateChain("validator")).hasSize(4);
assertEquals(loadedKeyStore.getCertificateChain("validator"), 4);
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be using hasSize or similar so we check the array size and not do a object comparison

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

delehef and others added 5 commits December 6, 2023 09:06
@delehef
fix: double calls to trace{Start,End}Transaction (hyperledger#6247)
2513088 
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
@macfarla
migrate to junit5 (hyperledger#6234)
8b1972f 
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
@garyschulte
fixes for problems discovered in main (hyperledger#6248)
1774b4e 
Signed-off-by: garyschulte <garyschulte@gmail.com>
@macfarla
fixed test comparing size of collection
ae64d72 
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
@macfarla
Merge branch 'main' of github.com:hyperledger/besu into pki-junit-5
deaff95
jframe
jframe approved these changes Dec 7, 2023
View reviewed changes
Copy link
Contributor

@jframe jframe left a comment

Choose a reason for hiding this comment

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

LGTM

@macfarla macfarla merged commit 4cc2eed into hyperledger:main Dec 7, 2023
18 checks passed
garyschulte added a commit to matkt/besu that referenced this pull request Dec 7, 2023
@macfarla @delehef @garyschulte
Pki - migrate to junit 5 (hyperledger#6235)
41f3f75 
* migrate to junit5

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fix: double calls to trace{Start,End}Transaction (hyperledger#6247)

Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>

* migrate to junit5 (hyperledger#6234)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fixes for problems discovered in main (hyperledger#6248)

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

* fixed test comparing size of collection

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: delehef <franklin.delehelle@odena.eu>
Co-authored-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
jflo pushed a commit to jflo/besu that referenced this pull request Dec 12, 2023
@macfarla @delehef
@garyschulte @jflo
Pki - migrate to junit 5 (hyperledger#6235)
6aceb06 
* migrate to junit5

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fix: double calls to trace{Start,End}Transaction (hyperledger#6247)

Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>

* migrate to junit5 (hyperledger#6234)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fixes for problems discovered in main (hyperledger#6248)

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

* fixed test comparing size of collection

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: delehef <franklin.delehelle@odena.eu>
Co-authored-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>
jflo added a commit that referenced this pull request Dec 12, 2023
@jflo @Gabriel-Trintinalia
@dlutzardo @fab-10 @siladu @gfukushima @delehef @macfarla @garyschulte @pinges @matkt @matthew1001 @diega
Release candidate 3 for 23.10.3 (#6286)
536c444 
* New cli options to limit rewards return by eth_feeHistory  (#6202)
* [#5851] Add error messages on authentication failures with username and password (#6212)
* Add a constant for the 'password'
* Add error messages on authentication failures with username and password

Signed-off-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: jflo <justin+github@florentine.us>
Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>



Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

* Add test to check empty login and check response in body is not empty

Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

* Correct format (spotless)

Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

* Update ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java

Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

* Update ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java

Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

* Update JsonRpcHttpServiceLoginTest.java

use containsIgnoringCase

Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

* Add a CHANGELOG entry for PR 6212

Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>

---------

Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>
Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: jflo <justin+github@florentine.us>

* Add RockDB Subcommand for printing usage per column family (#6185)

* Add RockDB Subcommand for printing usage per column family
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

* changed output to follow a MD table notation.

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

---------

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Deprecation warning if Forest pruning is enabled (#6230)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: jflo <justin+github@florentine.us>

* Fix the annoying "Errors occurred while build effective model" during builds (#6241)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: jflo <justin+github@florentine.us>

* Run ATs sequentially (#6244)

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* fix: double calls to trace{Start,End}Transaction (#6247)

Signed-off-by: delehef <franklin.delehelle@odena.eu>
Signed-off-by: jflo <justin+github@florentine.us>

* migrate to junit5 (#6234)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* fixes for problems discovered in main (#6248)

Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Pki - migrate to junit 5 (#6235)

* migrate to junit5

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fix: double calls to trace{Start,End}Transaction (#6247)

Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>

* migrate to junit5 (#6234)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fixes for problems discovered in main (#6248)

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

* fixed test comparing size of collection

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: delehef <franklin.delehelle@odena.eu>
Co-authored-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* junit 5 ftw (#6253)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* removed unnecessary use of static temp dir  (#6251)

* don't use static tempdir

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Remove parallelism usage from mainnet AT (#6252)

* Remove parallelism usage from mainnet AT

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

* Increase parallelism usage from mainnet AT

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

* Add the split command back

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

---------

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* fix log params (#6254)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com>
Signed-off-by: jflo <justin+github@florentine.us>

* add dependency on jar task (#6255)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Fix and test that the BlockAwareOperationTracer methods are invoked the correct number of times (#6259)

* Test that the BlockAwareOperationTracer are invoked the correct number of times
* Remove redundant calls to traceEndBlock

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: jflo <justin+github@florentine.us>

* [RPC] Use apiConfiguration to limit gasPrice in eth_getGasPrice (#6243)

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Signed-off-by: jflo <justin+github@florentine.us>

* log bootnodes and static nodes list at debug level (#6273)

* log bootnodes and static nodes list at debug level

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* log if zero bootnodes

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* null safeguards

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* junit 5 (#6256)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Non bft group ats junit 5 (#6260)

* migrate to junit 5

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Txparse subcommand implementation (#6268)

* txparse subcommand

Signed-off-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* [MINOR] migrate remaining Crypto tests to junit 5 (#6280)

* update crypto tests to junit5

* fixed temp file

* removed vintage junit dep

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* add a fix to load correctly the storage trie in the Bonsai WorldState (#6205)

revert some modification that was made to pass tests #5686 and fix this tests by loading the storage with EMPTY_TRIE_HASH if we detect that it has been cleared before pushing the new slots after recreation.

---------

Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
Signed-off-by: matkt <karim.t2am@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* Sequenced pool synonym for legacy pool (#6274)

* Sequenced pool synonym for legacy pool

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

* Class rename

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

* Spotless fixes

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

* Add SEQUENCED to config overview test

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>

* Update CHANGELOG.md

Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Matt Whitehead <matthew1001@hotmail.com>

* add a fix to load correctly the storage trie in the Bonsai WorldState (#6205)

revert some modification that was made to pass tests #5686 and fix this tests by loading the storage with EMPTY_TRIE_HASH if we detect that it has been cleared before pushing the new slots after recreation.

---------

Signed-off-by: Karim TAAM <karim.t2am@gmail.com>

---------

Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matt Whitehead <matthew1001@hotmail.com>
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Co-authored-by: matkt <karim.t2am@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* ETC mainnet 'Spiral' activation block (#6267)

* Set ENR tree for DNS discovery for ETC mainnet network

Signed-off-by: Diego López León <dieguitoll@gmail.com>

* Set activation block number for ECIP-1109 on ETC mainnet

Signed-off-by: Diego López León <dieguitoll@gmail.com>

---------

Signed-off-by: Diego López León <dieguitoll@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>

* uprev to version 23.10.3-RC3

Signed-off-by: jflo <justin+github@florentine.us>

---------

Signed-off-by: Justin Florentine <justin+github@florentine.us>
Signed-off-by: jflo <justin+github@florentine.us>
Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Signed-off-by: David Lutzardo <jdlutzardo@izertis.com>
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: delehef <franklin.delehelle@odena.eu>
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
Signed-off-by: Karim TAAM <karim.t2am@gmail.com>
Signed-off-by: matkt <karim.t2am@gmail.com>
Signed-off-by: Matthew Whitehead <matthew1001@gmail.com>
Signed-off-by: Matt Whitehead <matthew1001@hotmail.com>
Signed-off-by: Diego López León <dieguitoll@gmail.com>
Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Co-authored-by: David Lutzardo <jdlutzardo@izertis.com>
Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Co-authored-by: delehef <franklin.delehelle@odena.eu>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
Co-authored-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: Stefan Pingel <16143240+pinges@users.noreply.github.com>
Co-authored-by: matkt <karim.t2am@gmail.com>
Co-authored-by: Matt Whitehead <matthew1001@gmail.com>
Co-authored-by: Diego López León <dieguitoll@gmail.com>
gfukushima pushed a commit to gfukushima/besu that referenced this pull request Dec 15, 2023
@macfarla @delehef
@garyschulte @gfukushima
Pki - migrate to junit 5 (hyperledger#6235)
cd8965f 
* migrate to junit5

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fix: double calls to trace{Start,End}Transaction (hyperledger#6247)

Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>

* migrate to junit5 (hyperledger#6234)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fixes for problems discovered in main (hyperledger#6248)

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

* fixed test comparing size of collection

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: delehef <franklin.delehelle@odena.eu>
Co-authored-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
jflo pushed a commit to jflo/besu that referenced this pull request Dec 18, 2023
@macfarla @delehef
@garyschulte @jflo
Pki - migrate to junit 5 (hyperledger#6235)
fd5591a 
* migrate to junit5

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fix: double calls to trace{Start,End}Transaction (hyperledger#6247)

Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>

* migrate to junit5 (hyperledger#6234)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

* fixes for problems discovered in main (hyperledger#6248)

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

* fixed test comparing size of collection

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>

---------

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
Signed-off-by: Franklin Delehelle <franklin.delehelle@odena.eu>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Co-authored-by: delehef <franklin.delehelle@odena.eu>
Co-authored-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: jflo <justin+github@florentine.us>
@non-fungible-nelson non-fungible-nelson mentioned this pull request Dec 21, 2023
Closed
@macfarla macfarla deleted the pki-junit-5 branch January 3, 2024 01:08
@Gabriel-Trintinalia Gabriel-Trintinalia mentioned this pull request Jan 11, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jframe jframe jframe approved these changes

Assignees
No one assigned
Labels
testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

pki - migrate tests from Junit4 to Junit5
4 participants
@macfarla @jframe @delehef @garyschulte