Skip to content

Commit 585dd98

Browse files
author
Bob Dill
committed
update startup.sh all chapters, update sample.js all chapters;
1 parent 84a2a64 commit 585dd98

File tree

19 files changed

+194
-74
lines changed

19 files changed

+194
-74
lines changed

‎Chapter04/network/lib/sample.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function CreateOrder(purchase) {
4949
* @transaction
5050
*/
5151
function Buy(purchase) {
52-
if (purchase.order.status = JSON.stringify(orderStatus.Created))
52+
if (purchase.order.status == JSON.stringify(orderStatus.Created))
5353
{
5454
purchase.order.buyer = purchase.buyer;
5555
purchase.order.seller = purchase.seller;
@@ -64,7 +64,7 @@ function Buy(purchase) {
6464
* @transaction
6565
*/
6666
function OrderCancel(purchase) {
67-
if ((purchase.order.status = JSON.stringify(orderStatus.Created)) || (purchase.order.status = JSON.stringify(orderStatus.Bought)))
67+
if ((purchase.order.status == JSON.stringify(orderStatus.Created)) || (purchase.order.status == JSON.stringify(orderStatus.Bought)))
6868
{
6969
purchase.order.buyer = purchase.buyer;
7070
purchase.order.seller = purchase.seller;
@@ -79,7 +79,7 @@ function OrderCancel(purchase) {
7979
* @transaction
8080
*/
8181
function OrderFromSupplier(purchase) {
82-
if (purchase.order.status = JSON.stringify(orderStatus.Bought))
82+
if (purchase.order.status == JSON.stringify(orderStatus.Bought))
8383
{
8484
purchase.order.provider = purchase.provider;
8585
/*
@@ -93,7 +93,7 @@ function OrderFromSupplier(purchase) {
9393
* @transaction
9494
*/
9595
function RequestShipping(purchase) {
96-
if (purchase.order.status = JSON.stringify(orderStatus.Ordered))
96+
if (purchase.order.status == JSON.stringify(orderStatus.Ordered))
9797
{
9898
purchase.order.shipper = purchase.shipper;
9999
/*
@@ -107,7 +107,7 @@ function RequestShipping(purchase) {
107107
* @transaction
108108
*/
109109
function Delivering(purchase) {
110-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
110+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
111111
{
112112
purchase.order.delivering = new Date().toISOString();
113113
var _status = orderStatus.Delivering;
@@ -123,7 +123,7 @@ function Delivering(purchase) {
123123
* @transaction
124124
*/
125125
function Deliver(purchase) {
126-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
126+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
127127
{
128128
/*
129129
** Your Code Goes Here

‎Chapter05/network/lib/sample.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function CreateOrder(purchase) {
5252
* @transaction
5353
*/
5454
function Buy(purchase) {
55-
if (purchase.order.status = JSON.stringify(orderStatus.Created))
55+
if (purchase.order.status == JSON.stringify(orderStatus.Created))
5656
{
5757
purchase.order.buyer = purchase.buyer;
5858
purchase.order.seller = purchase.seller;
@@ -70,7 +70,7 @@ function Buy(purchase) {
7070
* @transaction
7171
*/
7272
function OrderCancel(purchase) {
73-
if ((purchase.order.status = JSON.stringify(orderStatus.Created)) || (purchase.order.status = JSON.stringify(orderStatus.Bought)))
73+
if ((purchase.order.status == JSON.stringify(orderStatus.Created)) || (purchase.order.status == JSON.stringify(orderStatus.Bought)))
7474
{
7575
purchase.order.buyer = purchase.buyer;
7676
purchase.order.seller = purchase.seller;
@@ -88,7 +88,7 @@ function OrderCancel(purchase) {
8888
* @transaction
8989
*/
9090
function OrderFromSupplier(purchase) {
91-
if (purchase.order.status = JSON.stringify(orderStatus.Bought))
91+
if (purchase.order.status == JSON.stringify(orderStatus.Bought))
9292
{
9393
purchase.order.provider = purchase.provider;
9494
purchase.order.ordered = new Date().toISOString();
@@ -105,7 +105,7 @@ function OrderFromSupplier(purchase) {
105105
* @transaction
106106
*/
107107
function RequestShipping(purchase) {
108-
if (purchase.order.status = JSON.stringify(orderStatus.Ordered))
108+
if (purchase.order.status == JSON.stringify(orderStatus.Ordered))
109109
{
110110
purchase.order.shipper = purchase.shipper;
111111
purchase.order.requestShipment = new Date().toISOString();
@@ -122,7 +122,7 @@ function RequestShipping(purchase) {
122122
* @transaction
123123
*/
124124
function Delivering(purchase) {
125-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
125+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
126126
{
127127
purchase.order.delivering = new Date().toISOString();
128128
var _status = orderStatus.Delivering;
@@ -140,7 +140,7 @@ function Delivering(purchase) {
140140
* @transaction
141141
*/
142142
function Deliver(purchase) {
143-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
143+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
144144
{
145145
purchase.order.delivered = new Date().toISOString();
146146
purchase.order.status = JSON.stringify(orderStatus.Delivered);

‎Chapter06/network/lib/sample.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function CreateOrder(purchase) {
5151
* @transaction
5252
*/
5353
function Buy(purchase) {
54-
if (purchase.order.status = JSON.stringify(orderStatus.Created))
54+
if (purchase.order.status == JSON.stringify(orderStatus.Created))
5555
{
5656
purchase.order.buyer = purchase.buyer;
5757
purchase.order.seller = purchase.seller;
@@ -69,7 +69,7 @@ function Buy(purchase) {
6969
* @transaction
7070
*/
7171
function OrderCancel(purchase) {
72-
if ((purchase.order.status = JSON.stringify(orderStatus.Created)) || (purchase.order.status = JSON.stringify(orderStatus.Bought)))
72+
if ((purchase.order.status == JSON.stringify(orderStatus.Created)) || (purchase.order.status == JSON.stringify(orderStatus.Bought)))
7373
{
7474
purchase.order.buyer = purchase.buyer;
7575
purchase.order.seller = purchase.seller;
@@ -87,7 +87,7 @@ function OrderCancel(purchase) {
8787
* @transaction
8888
*/
8989
function OrderFromSupplier(purchase) {
90-
if (purchase.order.status = JSON.stringify(orderStatus.Bought))
90+
if (purchase.order.status == JSON.stringify(orderStatus.Bought))
9191
{
9292
purchase.order.provider = purchase.provider;
9393
purchase.order.ordered = new Date().toISOString();
@@ -104,7 +104,7 @@ function OrderFromSupplier(purchase) {
104104
* @transaction
105105
*/
106106
function RequestShipping(purchase) {
107-
if (purchase.order.status = JSON.stringify(orderStatus.Ordered))
107+
if (purchase.order.status == JSON.stringify(orderStatus.Ordered))
108108
{
109109
purchase.order.shipper = purchase.shipper;
110110
purchase.order.requestShipment = new Date().toISOString();
@@ -121,7 +121,7 @@ function RequestShipping(purchase) {
121121
* @transaction
122122
*/
123123
function Delivering(purchase) {
124-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
124+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
125125
{
126126
purchase.order.delivering = new Date().toISOString();
127127
var _status = orderStatus.Delivering;
@@ -139,7 +139,7 @@ function Delivering(purchase) {
139139
* @transaction
140140
*/
141141
function Deliver(purchase) {
142-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
142+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
143143
{
144144
purchase.order.delivered = new Date().toISOString();
145145
purchase.order.status = JSON.stringify(orderStatus.Delivered);

‎Chapter06/startup.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function getCurrent()
1919
{
2020
showStep "getting current directory"
2121
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
22+
echo "DIR in startup.sh is $DIR"
2223
THIS_SCRIPT=`basename "$0"`
2324
showStep "Running '${THIS_SCRIPT}'"
2425
}
@@ -30,7 +31,8 @@ function showStep ()
3031
echo -e "${RESET}-----> $*" | indent
3132
echo -e "${YELLOW}=====================================================${RESET}" | indent
3233
}
33-
34+
showStep "running getCurrent"
35+
getCurrent
3436
showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
3537
cd "${HLF_INSTALL_PATH}"
3638
showStep "starting fabric"
@@ -42,5 +44,18 @@ showStep "starting fabric"
4244
#
4345
showStep "creating new PeerAdmin card (required with each restart)"
4446
./createPeerAdminCard.sh
47+
showStep "copying admin card to ~/.hfc-key-store"
48+
CA_PEM_SOURCE="$DIR/controller/restapi/features/composer/creds"
49+
PEER_SOURCE="$HOME/.composer/client-data/PeerAdmin@hlfv1/*"
50+
HFC_KEY_STORE="$HOME/.hfc-key-store"
51+
echo "CA_PEM_SOURCE is: $CA_PEM_SOURCE"
52+
echo "PEER_SOURCE is: $PEER_SOURCE"
53+
echo "HFC_KEY_STORE is: $HFC_KEY_STORE"
54+
rm -R $HFC_KEY_STORE/
55+
mkdir $HFC_KEY_STORE
56+
cp -Rv ${CA_PEM_SOURCE}/ca.pem ${HFC_KEY_STORE}/
57+
cp -Rv ${PEER_SOURCE} ${HFC_KEY_STORE}/
58+
cp -Rv ${PEER_SOURCE} ${CA_PEM_SOURCE}/
59+
showStep 'Listing current cards'
4560
composer card list --name PeerAdmin@hlfv1
4661
showStep "start up complete"

‎Chapter07/network/lib/sample.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function CreateOrder(purchase) {
5151
* @transaction
5252
*/
5353
function Buy(purchase) {
54-
if (purchase.order.status = JSON.stringify(orderStatus.Created))
54+
if (purchase.order.status == JSON.stringify(orderStatus.Created))
5555
{
5656
purchase.order.buyer = purchase.buyer;
5757
purchase.order.seller = purchase.seller;
@@ -69,7 +69,7 @@ function Buy(purchase) {
6969
* @transaction
7070
*/
7171
function OrderCancel(purchase) {
72-
if ((purchase.order.status = JSON.stringify(orderStatus.Created)) || (purchase.order.status = JSON.stringify(orderStatus.Bought)))
72+
if ((purchase.order.status == JSON.stringify(orderStatus.Created)) || (purchase.order.status == JSON.stringify(orderStatus.Bought)))
7373
{
7474
purchase.order.buyer = purchase.buyer;
7575
purchase.order.seller = purchase.seller;
@@ -87,7 +87,7 @@ function OrderCancel(purchase) {
8787
* @transaction
8888
*/
8989
function OrderFromSupplier(purchase) {
90-
if (purchase.order.status = JSON.stringify(orderStatus.Bought))
90+
if (purchase.order.status == JSON.stringify(orderStatus.Bought))
9191
{
9292
purchase.order.provider = purchase.provider;
9393
purchase.order.ordered = new Date().toISOString();
@@ -104,7 +104,7 @@ function OrderFromSupplier(purchase) {
104104
* @transaction
105105
*/
106106
function RequestShipping(purchase) {
107-
if (purchase.order.status = JSON.stringify(orderStatus.Ordered))
107+
if (purchase.order.status == JSON.stringify(orderStatus.Ordered))
108108
{
109109
purchase.order.shipper = purchase.shipper;
110110
purchase.order.requestShipment = new Date().toISOString();
@@ -121,7 +121,7 @@ function RequestShipping(purchase) {
121121
* @transaction
122122
*/
123123
function Delivering(purchase) {
124-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
124+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
125125
{
126126
purchase.order.delivering = new Date().toISOString();
127127
var _status = orderStatus.Delivering;
@@ -139,7 +139,7 @@ function Delivering(purchase) {
139139
* @transaction
140140
*/
141141
function Deliver(purchase) {
142-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
142+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
143143
{
144144
purchase.order.delivered = new Date().toISOString();
145145
purchase.order.status = JSON.stringify(orderStatus.Delivered);

‎Chapter07/startup.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function getCurrent()
1919
{
2020
showStep "getting current directory"
2121
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
22+
echo "DIR in startup.sh is $DIR"
2223
THIS_SCRIPT=`basename "$0"`
2324
showStep "Running '${THIS_SCRIPT}'"
2425
}
@@ -30,7 +31,8 @@ function showStep ()
3031
echo -e "${RESET}-----> $*" | indent
3132
echo -e "${YELLOW}=====================================================${RESET}" | indent
3233
}
33-
34+
showStep "running getCurrent"
35+
getCurrent
3436
showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
3537
cd "${HLF_INSTALL_PATH}"
3638
showStep "starting fabric"
@@ -42,5 +44,18 @@ showStep "starting fabric"
4244
#
4345
showStep "creating new PeerAdmin card (required with each restart)"
4446
./createPeerAdminCard.sh
47+
showStep "copying admin card to ~/.hfc-key-store"
48+
CA_PEM_SOURCE="$DIR/controller/restapi/features/composer/creds"
49+
PEER_SOURCE="$HOME/.composer/client-data/PeerAdmin@hlfv1/*"
50+
HFC_KEY_STORE="$HOME/.hfc-key-store"
51+
echo "CA_PEM_SOURCE is: $CA_PEM_SOURCE"
52+
echo "PEER_SOURCE is: $PEER_SOURCE"
53+
echo "HFC_KEY_STORE is: $HFC_KEY_STORE"
54+
rm -R $HFC_KEY_STORE/
55+
mkdir $HFC_KEY_STORE
56+
cp -Rv ${CA_PEM_SOURCE}/ca.pem ${HFC_KEY_STORE}/
57+
cp -Rv ${PEER_SOURCE} ${HFC_KEY_STORE}/
58+
cp -Rv ${PEER_SOURCE} ${CA_PEM_SOURCE}/
59+
showStep 'Listing current cards'
4560
composer card list --name PeerAdmin@hlfv1
4661
showStep "start up complete"

‎Chapter08/network/lib/sample.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function CreateOrder(purchase) {
5151
* @transaction
5252
*/
5353
function Buy(purchase) {
54-
if (purchase.order.status = JSON.stringify(orderStatus.Created))
54+
if (purchase.order.status == JSON.stringify(orderStatus.Created))
5555
{
5656
purchase.order.buyer = purchase.buyer;
5757
purchase.order.seller = purchase.seller;
@@ -69,7 +69,7 @@ function Buy(purchase) {
6969
* @transaction
7070
*/
7171
function OrderCancel(purchase) {
72-
if ((purchase.order.status = JSON.stringify(orderStatus.Created)) || (purchase.order.status = JSON.stringify(orderStatus.Bought)))
72+
if ((purchase.order.status == JSON.stringify(orderStatus.Created)) || (purchase.order.status == JSON.stringify(orderStatus.Bought)) || (purchase.order.status == JSON.stringify(orderStatus.Backordered)))
7373
{
7474
purchase.order.buyer = purchase.buyer;
7575
purchase.order.seller = purchase.seller;
@@ -87,7 +87,7 @@ function OrderCancel(purchase) {
8787
* @transaction
8888
*/
8989
function OrderFromSupplier(purchase) {
90-
if (purchase.order.status = JSON.stringify(orderStatus.Bought))
90+
if (purchase.order.status == JSON.stringify(orderStatus.Bought))
9191
{
9292
purchase.order.provider = purchase.provider;
9393
purchase.order.ordered = new Date().toISOString();
@@ -104,7 +104,7 @@ function OrderFromSupplier(purchase) {
104104
* @transaction
105105
*/
106106
function RequestShipping(purchase) {
107-
if (purchase.order.status = JSON.stringify(orderStatus.Ordered))
107+
if (purchase.order.status == JSON.stringify(orderStatus.Ordered))
108108
{
109109
purchase.order.shipper = purchase.shipper;
110110
purchase.order.requestShipment = new Date().toISOString();
@@ -121,7 +121,7 @@ function RequestShipping(purchase) {
121121
* @transaction
122122
*/
123123
function Delivering(purchase) {
124-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
124+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
125125
{
126126
purchase.order.delivering = new Date().toISOString();
127127
var _status = orderStatus.Delivering;
@@ -139,7 +139,7 @@ function Delivering(purchase) {
139139
* @transaction
140140
*/
141141
function Deliver(purchase) {
142-
if ((purchase.order.status = JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code = orderStatus.Delivering.code))
142+
if ((purchase.order.status == JSON.stringify(orderStatus.ShipRequest)) || (JSON.parse(purchase.order.status).code == orderStatus.Delivering.code))
143143
{
144144
purchase.order.delivered = new Date().toISOString();
145145
purchase.order.status = JSON.stringify(orderStatus.Delivered);

‎Chapter08/startup.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function getCurrent()
1919
{
2020
showStep "getting current directory"
2121
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
22+
echo "DIR in startup.sh is $DIR"
2223
THIS_SCRIPT=`basename "$0"`
2324
showStep "Running '${THIS_SCRIPT}'"
2425
}
@@ -30,7 +31,8 @@ function showStep ()
3031
echo -e "${RESET}-----> $*" | indent
3132
echo -e "${YELLOW}=====================================================${RESET}" | indent
3233
}
33-
34+
showStep "running getCurrent"
35+
getCurrent
3436
showStep "using execs from previous installation, stored in ${HLF_INSTALL_PATH}"
3537
cd "${HLF_INSTALL_PATH}"
3638
showStep "starting fabric"
@@ -42,5 +44,18 @@ showStep "starting fabric"
4244
#
4345
showStep "creating new PeerAdmin card (required with each restart)"
4446
./createPeerAdminCard.sh
47+
showStep "copying admin card to ~/.hfc-key-store"
48+
CA_PEM_SOURCE="$DIR/controller/restapi/features/composer/creds"
49+
PEER_SOURCE="$HOME/.composer/client-data/PeerAdmin@hlfv1/*"
50+
HFC_KEY_STORE="$HOME/.hfc-key-store"
51+
echo "CA_PEM_SOURCE is: $CA_PEM_SOURCE"
52+
echo "PEER_SOURCE is: $PEER_SOURCE"
53+
echo "HFC_KEY_STORE is: $HFC_KEY_STORE"
54+
rm -R $HFC_KEY_STORE/
55+
mkdir $HFC_KEY_STORE
56+
cp -Rv ${CA_PEM_SOURCE}/ca.pem ${HFC_KEY_STORE}/
57+
cp -Rv ${PEER_SOURCE} ${HFC_KEY_STORE}/
58+
cp -Rv ${PEER_SOURCE} ${CA_PEM_SOURCE}/
59+
showStep 'Listing current cards'
4560
composer card list --name PeerAdmin@hlfv1
4661
showStep "start up complete"

0 commit comments

Comments
 (0)