Update 'Using Private Data in Fabric' tutorial

[denali49]

Signed-off-by: Chris Gabriel chris_gabriel_98@yahoo.com

Type of change

• Documentation update

Description

This tutorial update integrates the new fabric-samples private data asset transfer README into the existing "Using Private Data in Fabric" tutorial per the direction of the fabric-samples workgroup.

[ale-linux]

A couple of minor nits. @denyeart have you (or do you know whether any of the maintainers have) tested the tutorial?

[kalid117658]

2489

[nikhil550]

The tutorial should eventually contain the asset transfer flow that is contained in the readme here: https://github.com/hyperledger/fabric-samples/tree/master/asset-transfer-private-data/chaincode-go. Eventually we should aim to remove that readme and link to the tutorial. If the tutorial works from e2e, I am ok merging it and iterating from there, so that we are away from the dependency on the old private data smart contract.

I think we can also replace the commands to use the chaincode lifecycle with the command to deploy using the test network script to shorten the tutorial, but that can also follow later.

[denali49]

The transfer flow is included in the purge private data section. I can specifically call it out with it’s own header.

…

Sent from my iPhone

On Sep 14, 2020, at 8:24 AM, nikhil550 ***@***.***> wrote:  The tutorial should eventually contain the asset transfer flow that is contained in the readme here: https://github.com/hyperledger/fabric-samples/tree/master/asset-transfer-private-data/chaincode-go. Eventually we should aim to remove that readme and link to the tutorial. If the tutorial works from e2e, I am ok merging it and iterating from there, so that we are away from the dependency on the old private data smart contract. I think we can also replace the commands to use the chaincode lifecycle with the command to deploy using the test network script to shorten the tutorial, but that can also follow later. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.

[denali49]

It worked for me e2e, I tested it twice before I pushed it. I welcome peer review testing though.

…

Sent from my iPhone

On Sep 14, 2020, at 8:24 AM, nikhil550 ***@***.***> wrote:  The tutorial should eventually contain the asset transfer flow that is contained in the readme here: https://github.com/hyperledger/fabric-samples/tree/master/asset-transfer-private-data/chaincode-go. Eventually we should aim to remove that readme and link to the tutorial. If the tutorial works from e2e, I am ok merging it and iterating from there, so that we are away from the dependency on the old private data smart contract. I think we can also replace the commands to use the chaincode lifecycle with the command to deploy using the test network script to shorten the tutorial, but that can also follow later. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.

[lindluni]

Why the addition of the two Pipfile's? Especially the one in the root of the repo?

[denali49]

That was a local doc build accident. I’ll clean it up when addressing the latest comments.

…

Sent from my iPhone

On Sep 14, 2020, at 9:14 AM, Brett Logan ***@***.***> wrote:  @btl5037 requested changes on this pull request. Why the addition of the two Pipfile's? Especially the one in the root of the repo? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.

[denali49]

The tutorial should eventually contain the asset transfer flow that is contained in the readme here: https://github.com/hyperledger/fabric-samples/tree/master/asset-transfer-private-data/chaincode-go. Eventually we should aim to remove that readme and link to the tutorial. If the tutorial works from e2e, I am ok merging it and iterating from there, so that we are away from the dependency on the old private data smart contract.

I think we can also replace the commands to use the chaincode lifecycle with the command to deploy using the test network script to shorten the tutorial, but that can also follow later.

I added an asset transfer header, to specifically call this out. The original direction was to integrate the private data README into the existing tutorial which I took to mean that we wanted to keep the flow of the tutorial. We can certainly just adopt the README flow as well and drop the peer chaincode lifecycle piece in favor of the script approach to make it shorter, but I agree we should merge for now and do that in another PR.

[nikhil550]

The tutorial should eventually contain the asset transfer flow that is contained in the readme here: https://github.com/hyperledger/fabric-samples/tree/master/asset-transfer-private-data/chaincode-go. Eventually we should aim to remove that readme and link to the tutorial. If the tutorial works from e2e, I am ok merging it and iterating from there, so that we are away from the dependency on the old private data smart contract.
I think we can also replace the commands to use the chaincode lifecycle with the command to deploy using the test network script to shorten the tutorial, but that can also follow later.

I added an asset transfer header, to specifically call this out. The original direction was to integrate the private data README into the existing tutorial which I took to mean that we wanted to keep the flow of the tutorial. We can certainly just adopt the README flow as well and drop the peer chaincode lifecycle piece in favor of the script approach to make it shorter, but I agree we should merge for now and do that in another PR.

I agree that we need to maintain the current flow of the tutorial, at least in terms of keeping the technical sections. we can work to integrate and improve the flow until the readme is redundant.

[nikhil550]

Ran fine on my computer. I have some comments on the flow in addition to the existing comments. Ill let you address, but we may want to merge and iterate and some point.

[denali49]

Why the addition of the two Pipfile's? Especially the one in the root of the repo?

@btl5037 this has been addressed for some time, please review so we can get merged.

[denali49]

@Mergifyio backport release-2.2

[mergify]

Command backport release-2.2: failure

No backport have been created

• Backport to branch release-2.2 failed

Cherry-pick of 17858a5 has failed:

On branch mergify/bp/release-2.2/pr-1875
Your branch is up to date with 'origin/release-2.2'.

You are currently cherry-picking commit 17858a570.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   docs/source/images/SideDB-org1-org2.png
	modified:   docs/source/images/SideDBTutorialImages.pptx

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   docs/source/private_data_tutorial.rst