@@ -23,7 +23,6 @@ import (
23
23
"time"
24
24
25
25
"encoding/base64"
26
- "io/ioutil"
27
26
"os"
28
27
"path/filepath"
29
28
@@ -33,6 +32,7 @@ import (
33
32
"github.com/hyperledger/fabric/core/container"
34
33
"github.com/hyperledger/fabric/core/crypto"
35
34
"github.com/hyperledger/fabric/core/ledger"
35
+ "github.com/hyperledger/fabric/core/util"
36
36
"github.com/hyperledger/fabric/membersrvc/ca"
37
37
pb "github.com/hyperledger/fabric/protos"
38
38
"github.com/op/go-logging"
@@ -180,7 +180,7 @@ func deploy(admCert crypto.CertificateHandler) error {
180
180
spec := & pb.ChaincodeSpec {
181
181
Type : 1 ,
182
182
ChaincodeID : & pb.ChaincodeID {Name : "mycc" },
183
- CtorMsg : & pb.ChaincodeInput {Function : "init" , Args : [] string {} },
183
+ CtorMsg : & pb.ChaincodeInput {Args : util . ToChaincodeArgs ( "init" ) },
184
184
Metadata : []byte ("assigner" ),
185
185
ConfidentialityLevel : pb .ConfidentialityLevel_PUBLIC ,
186
186
}
@@ -224,7 +224,7 @@ func assignOwnership(assigner crypto.Client, asset string, newOwnerCert crypto.C
224
224
}
225
225
226
226
newOwner := base64 .StdEncoding .EncodeToString (newOwnerCert .GetCertificate ())
227
- chaincodeInput := & pb.ChaincodeInput {Function : "assign" , Args : [] string { asset , newOwner } }
227
+ chaincodeInput := & pb.ChaincodeInput {Args : util . ToChaincodeArgs ( "assign" , asset , newOwner ) }
228
228
229
229
// Prepare spec and submit
230
230
spec := & pb.ChaincodeSpec {
@@ -270,7 +270,7 @@ func transferOwnership(owner crypto.Client, ownerCert crypto.CertificateHandler,
270
270
}
271
271
272
272
newOwner := base64 .StdEncoding .EncodeToString (newOwnerCert .GetCertificate ())
273
- chaincodeInput := & pb.ChaincodeInput {Function : "transfer" , Args : [] string { asset , newOwner } }
273
+ chaincodeInput := & pb.ChaincodeInput {Args : util . ToChaincodeArgs ( "transfer" , asset , newOwner ) }
274
274
275
275
// Prepare spec and submit
276
276
spec := & pb.ChaincodeSpec {
@@ -304,7 +304,7 @@ func transferOwnership(owner crypto.Client, ownerCert crypto.CertificateHandler,
304
304
}
305
305
306
306
func whoIsTheOwner (asset string ) ([]byte , error ) {
307
- chaincodeInput := & pb.ChaincodeInput {Function : "query" , Args : [] string { asset } }
307
+ chaincodeInput := & pb.ChaincodeInput {Args : util . ToChaincodeArgs ( "query" , asset ) }
308
308
309
309
// Prepare spec and submit
310
310
spec := & pb.ChaincodeSpec {
@@ -364,7 +364,6 @@ func setup() {
364
364
}
365
365
366
366
func initMembershipSrvc () {
367
- ca .LogInit (ioutil .Discard , os .Stdout , os .Stdout , os .Stderr , os .Stdout )
368
367
ca .CacheConfiguration () // Cache configuration
369
368
aca = ca .NewACA ()
370
369
eca = ca .NewECA ()
0 commit comments