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

Remove TLS = false if statement in test network #155

Merged
merged 1 commit into from
Apr 15, 2020

Conversation

nikhil550
Copy link
Contributor

@nikhil550 nikhil550 commented Apr 9, 2020

Signed-off-by: NIKHIL E GUPTA negupta@us.ibm.com

The create Channel and deploy chaincode scripts contained an if statement on whether TLS was enabled for many commands

  if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ] ; then

I assume this is left over from older versions of 1.x, and from Kafka or solo consensus. Since TLS is required for RAFT and other features, I removed the TLS not enabled option.

@nikhil550 nikhil550 requested a review from a team as a code owner April 9, 2020 18:28
Copy link
Contributor

@lehors lehors left a comment

Choose a reason for hiding this comment

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

SGTM but didn't you miss some related code that also ought to be removed?

$ git grep TLS_ENABLED
[...]
scripts/envVar.sh:    if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "true" ]; then
scripts/org3-scripts/envVarCLI.sh:    if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "true" ]; then
scripts/org3-scripts/step1org3.sh:  if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then

@nikhil550
Copy link
Contributor Author

TLS_ENABLED

Good catch. Removed these a well. Removed the parsePeerConnectionParameters function from the Org3 script since it is not used.

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
Copy link
Contributor

@lehors lehors left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@lehors lehors merged commit aa9b577 into hyperledger:master Apr 15, 2020
@nikhil550 nikhil550 deleted the rmNoTLS branch April 16, 2020 15:14
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.

2 participants