|
@@ -162,7 +162,7 @@ func (t *SimpleChaincode) createBillBatch(stub shim.ChaincodeStubInterface, args
|
|
|
var billInfos []Bill
|
|
|
err := json.Unmarshal([]byte(args[0]), &billInfos)
|
|
|
if err != nil {
|
|
|
- fmt.Println("getBillById: Unmarshal fail:", err.Error())
|
|
|
+ fmt.Println("createBillBatch: Unmarshal fail:", err.Error())
|
|
|
return shim.Error("createBillBatch(): json.Unmarshal fail:" + err.Error())
|
|
|
}
|
|
|
|
|
@@ -245,7 +245,7 @@ func (t *SimpleChaincode) queryBill(stub shim.ChaincodeStubInterface, args []str
|
|
|
|
|
|
_, billBytes, err := getBillById(stub, args[0])
|
|
|
if err != nil {
|
|
|
- fmt.Println("getBillById fail:", err.Error())
|
|
|
+ fmt.Println("queryBill fail:", err.Error())
|
|
|
return shim.Error("queryBill(): Fail to get Bill" + err.Error())
|
|
|
}
|
|
|
|
|
@@ -273,7 +273,6 @@ func (t *SimpleChaincode) queryTransaction(stub shim.ChaincodeStubInterface, arg
|
|
|
|
|
|
// Write Bill info into the fabric
|
|
|
func writeBill(stub shim.ChaincodeStubInterface, bill Bill) error {
|
|
|
-
|
|
|
billBytes, err := json.Marshal(&bill)
|
|
|
if err != nil {
|
|
|
fmt.Println("writeBill: Marshal fail:", err.Error())
|
|
@@ -314,11 +313,13 @@ func getBillById(stub shim.ChaincodeStubInterface, id string) (Bill, []byte, err
|
|
|
if err != nil {
|
|
|
fmt.Println("getBillById: GetState fail:", err.Error())
|
|
|
fmt.Println("Error retrieving cpBytes")
|
|
|
+ return bill, nil, errors.New("getBillById GetState GetState Error:" + err.Error())
|
|
|
}
|
|
|
err = json.Unmarshal(billBytes, &bill)
|
|
|
if err != nil {
|
|
|
fmt.Println("getBillById: Unmarshal fail:", err.Error())
|
|
|
fmt.Println("Error unmarshalling Bill")
|
|
|
+ //return bill, nil, errors.New("getBillById Unmarshal Error:" + err.Error())
|
|
|
}
|
|
|
return bill, billBytes, nil
|
|
|
}
|