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

Updated SimpleNodePermissioning smart contract to relax enodeURL matc… #945

Merged
merged 8 commits into from
May 20, 2020

Conversation

mark-terry
Copy link
Contributor

…hing to exclude the p2p port.

Signed-off-by: Mark Terry mark.terry@consensys.net

PR description

Relaxes the enodeURL matching function in the SimpleNodePermissioning smart contract to allow matches where the p2p port has changed. This addresses an issue in the Acceptance Tests where the port is dynamic and thus will not be permitted after a restart.

Fixed Issue(s)

Fixes #907.

…hing to exclude the p2p port.

Signed-off-by: Mark Terry <mark.terry@consensys.net>
Signed-off-by: Mark Terry <mark.terry@consensys.net>
Signed-off-by: Mark Terry <mark.terry@consensys.net>
Signed-off-by: Mark Terry <mark.terry@consensys.net>
@mark-terry mark-terry requested a review from macfarla May 19, 2020 03:56
Copy link
Member

@lucassaldanha lucassaldanha left a comment

Choose a reason for hiding this comment

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

LGTM

@mark-terry mark-terry merged commit 4174eb9 into hyperledger:master May 20, 2020
@mark-terry mark-terry deleted the 907-contract-update branch May 20, 2020 11:22
shemnon pushed a commit to shemnon/besu that referenced this pull request May 23, 2020
hyperledger#945)

Updated SimpleNodePermissioning smart contract in the acceptance tests to relax enodeURL matching to exclude the p2p port.

Signed-off-by: Mark Terry <mark.terry@consensys.net>
Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
macfarla pushed a commit to macfarla/besu that referenced this pull request Jun 3, 2020
hyperledger#945)

Updated SimpleNodePermissioning smart contract in the acceptance tests to relax enodeURL matching to exclude the p2p port.

Signed-off-by: Mark Terry <mark.terry@consensys.net>
Signed-off-by: Sally MacFarlane <sally.macfarlane@consensys.net>
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.

Implement configuration for acceptance test node to retain p2p port number
3 participants