From 608060e07a237d6621101111202b964024460faf Mon Sep 17 00:00:00 2001 From: yakumioto Date: Thu, 2 Jan 2020 17:16:33 +0800 Subject: [PATCH 1/2] docs: update README.md --- README-zh.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README-zh.md b/README-zh.md index c419bc2..2f73066 100644 --- a/README-zh.md +++ b/README-zh.md @@ -37,11 +37,11 @@ git clone https://github.com/yakumioto/hlf-deploy.git && \ 6. Instantiate go chaincode (mycc v1.0) 7. Query go chaincode 8. Invoke go chaincode -9. Add Org3 to mychannel -10. Modify Org3's certificate -11. Remove Org3 from mychannel -12. Upgrade from solo consensus to etcdraft consensus -13. Invoke and query chaincode to ensure that the consensus upgrade is successful +9. Add Org3 to mychannel (动态添加组织) +10. Modify Org3's certificate (动态修改组织证书) +11. Remove Org3 from mychannel (动态删除组织) +12. Upgrade from solo consensus to etcdraft consensus (从 solo 升级到 etcdraft) +13. Invoke and query chaincode to ensure that the consensus upgrade is successful (测试升级后的网络) 14. Install java chaincode (mycc v2.0) 15. Upgrade java chaincode (mycc v2.0) 16. Invoke java chaincode From 41aaf14230567c995af7a2c95a17a98faa6d1791 Mon Sep 17 00:00:00 2001 From: Yaku Mioto Date: Thu, 2 Jan 2020 17:51:05 +0800 Subject: [PATCH 2/2] chore: hlfn.sh supported mac os (#7) --- test-network/hlfn.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test-network/hlfn.sh b/test-network/hlfn.sh index 4fe8ee7..6e7243f 100755 --- a/test-network/hlfn.sh +++ b/test-network/hlfn.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh function printHelp() { @@ -15,7 +15,11 @@ function printHelp() { if [[ ! -f "../bin/hlf-deploy" ]]; then mkdir -p ../bin - curl -L -o ../bin/hlf-deploy https://github.com/yakumioto/hlf-deploy/releases/download/v0.1.0/hlf-deploy + if [[ "$(uname)" == "Darwin" ]]; then + curl -L -o ../bin/hlf-deploy https://github.com/yakumioto/hlf-deploy/releases/download/v0.2.0/hlf-deploy-darwin + elif [[ "$(expr substr $(uname -s) 1 5)" == "Linux" ]]; then + curl -L -o ../bin/hlf-deploy https://github.com/yakumioto/hlf-deploy/releases/download/v0.2.0/hlf-deploy-linux + fi chmod +x ../bin/hlf-deploy fi