Skip to content
GitLab
  1. 21 Oct, 2016 2 commits
    • Gregory Haskins's avatar
      Revert "... uses hardcoded hashcode for example02" · e3fe1e09
      Gregory Haskins authored 
      This reverts commit 5d9a3eab

.

chaincode_example04 calls chaincode_example02 via a hard-coded ID.
This is intentional to catch change to the ID when NOTHING in
chaincode_example02 or in its folder changes.  ie, a test for the
constancy of the hash generation algorithm.

The patch attempt pass the ID as a parameter to prevent accidental
changes to chaincode_example02 from causing test failures. While
well-intented, this subverts the above reasoning behind the
hard-coding.

Also note that chaincode_example05 does take the argument as a
parameter (so that usage is already covered).

Change-Id: I8e305efb6fd577bc7d7e3d720d293cfb0e3c191f
Signed-off-by: default avatarGreg Haskins <gregory.haskins@gmail.com>
      e3fe1e09
    • Gregory Haskins's avatar
      Merge v0.6 branch to master · 39f88026
      Gregory Haskins authored 
      This merges fa02382a from v0.6 into master.

 core/db/db.go                           |   26 +++++++
 docs/Setup/Chaincode-setup.md           |    2
 docs/Setup/NodeSDK-setup.md             |    3
 docs/Setup/TLSSetup.md                  |   66 ++++++++++++++++++
 docs/index.md                           |   14 +--
 docs/nodeSDK/app-developer-env-setup.md |    2
 docs/nodeSDK/node-sdk-guide.md          |    4 -
 membersrvc/ca/client_grpc.go            |  114 +++++++++++++++++++++++++++++++-
 membersrvc/membersrvc.yaml              |   20 ++++-
 membersrvc/server.go                    |    8 +-
 mkdocs.yml                              |   22 +++---
 peer/core.yaml                          |    6 +
 sdk/node/package.json                   |    3
 13 files changed, 257 insertions(+), 33 deletions(-)

Some patches were either already merged, or inappropriate for master
(e.g. setting v0.6 version numbers) and were therefore dropped.

One patch in particular:

    7123f77d

 xnode-sdk: Test Updates for supporting TLS - Allen Bailey

was dropped because it had complicated conflicts and we have been told
that SDK patches have already been extracted manually and master branch
SDK is being deprecated.  It was therefore not worth the effort to
resolve this further.

Change-Id: I862f6a3f20bb169394d67aa5aca064c51175fbae
Signed-off-by: default avatarGreg Haskins <gregory.haskins@gmail.com>
      39f88026
  3. 19 Oct, 2016 2 commits
  5. 17 Oct, 2016 4 commits
  7. 16 Oct, 2016 2 commits
  9. 15 Oct, 2016 3 commits
    • Allen Bailey's avatar
      xnode-sdk: Test Updates for supporting TLS · 7123f77d
      Allen Bailey authored 
      

changes required to test the fix for Fabric FAB-392
re-enable ACA+TLS unit test for node-sdk
Updated getOptsFromOpts() in hfs.ts
Updated eventHub setPeerAddr() in hfs.ts
Added new tests:
   ../test/unit/member-api.js
   ../test/unit/getChain.js

Change-Id: I3a1ad9a3f887720426ecd68de6bc4d1953f05eaf
Signed-off-by: default avatarAllen Bailey <eabailey@us.ibm.com>
      7123f77d
    • ASHUTOSH KUMAR's avatar
      Allow TLS conn. between the client and the CA services · 925f4d9b
      ASHUTOSH KUMAR authored 
      

Fixes FAB-392

Supporting TLS between the ACA client the rest of the CA services.

This feature requires changes to the configuration of the Membership
Services (YAML file), adding the support for two newly added (YAML)
configuration parameters under the security section of membersrvc.yaml.

To enable this feature (TLS connectivity), one needs to specify that
tls_enabled (=true) and a path to a PEM-encoded certificate file to
use. There is also the option to use the serverhostname override,
enforcing that the same TLS Server Certificate's Common Name to be used.

Change-Id: I64444d0e21615a47662ba1388cd6901ff787b408
Signed-off-by: default avatarASHUTOSH KUMAR <ashutosh_kumar@hotmail.com>
Signed-off-by: default avatarJonathanLevi <jonathan@levi.name>
Signed-off-by: default avatarGari Singh <gari.r.singh@gmail.com>
      925f4d9b
    • Jim Zhang's avatar
      Reverting the change in 1759 · de2cade1
      Jim Zhang authored 
      

Strangely, when testing locally the target chaincode hash in the cc2cc
unit test is calculated differently than when running on the build
machine. Reverting the hash value back to what the test generates
on the build machine.

Change-Id: I0e192b6ca0c7385ec7f93746d0deb23b98dd4361
Signed-off-by: default avatarJim Zhang <jzhang@us.ibm.com>
      de2cade1
  11. 14 Oct, 2016 6 commits
  13. 12 Oct, 2016 3 commits
  15. 11 Oct, 2016 4 commits
  17. 10 Oct, 2016 1 commit
  19. 08 Oct, 2016 3 commits
  21. 06 Oct, 2016 4 commits
  23. 05 Oct, 2016 2 commits
  25. 04 Oct, 2016 4 commits