diff --git a/token-erc-721/chaincode-go/chaincode/erc721-contract.go b/token-erc-721/chaincode-go/chaincode/erc721-contract.go index 5fe163e9..94257a13 100644 --- a/token-erc-721/chaincode-go/chaincode/erc721-contract.go +++ b/token-erc-721/chaincode-go/chaincode/erc721-contract.go @@ -1,4 +1,4 @@ -package TokenERC721Contract +package chaincode import ( "encoding/base64" @@ -17,7 +17,7 @@ const approvalPrefix = "approval" const nameKey = "name" const symbolKey = "symbol" -// TokenERC721Contract contract for managing CRUD for HlpNft +// TokenERC721Contract contract for managing CRUD operations type TokenERC721Contract struct { contractapi.Contract } diff --git a/token-erc-721/chaincode-go/chaincode/erc721-contract_test.go b/token-erc-721/chaincode-go/chaincode/erc721-contract_test.go index 1713ec3e..cbb88c67 100644 --- a/token-erc-721/chaincode-go/chaincode/erc721-contract_test.go +++ b/token-erc-721/chaincode-go/chaincode/erc721-contract_test.go @@ -1,4 +1,4 @@ -package TokenERC721Contract +package chaincode import ( "encoding/base64" @@ -14,7 +14,7 @@ import ( ) const owner = "x509::CN=minter,OU=client,O=Hyperledger,ST=North Carolina,C=US::CN=ca.org1.example.com,O=org1.example.com,L=Durham,ST=North Carolina,C=US" -const operator = "x509::CN=hlp,OU=client,O=Hyperledger,ST=North Carolina,C=US::CN=ca.org1.example.com,O=org1.example.com,L=Durham,ST=North Carolina,C=AR" +const operator = "x509::CN=org,OU=client,O=Hyperledger,ST=North Carolina,C=US::CN=ca.org1.example.com,O=org1.example.com,L=Durham,ST=North Carolina,C=AR" type MockStub struct { shim.ChaincodeStubInterface diff --git a/token-erc-721/chaincode-go/chaincode/erc721.go b/token-erc-721/chaincode-go/chaincode/erc721.go index 616854d2..5302f4d5 100644 --- a/token-erc-721/chaincode-go/chaincode/erc721.go +++ b/token-erc-721/chaincode-go/chaincode/erc721.go @@ -2,7 +2,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package TokenERC721Contract +package chaincode // Define structs to be used by chaincode type Nft struct { diff --git a/token-erc-721/chaincode-go/go.mod b/token-erc-721/chaincode-go/go.mod index 2ba27298..808e8643 100644 --- a/token-erc-721/chaincode-go/go.mod +++ b/token-erc-721/chaincode-go/go.mod @@ -1,12 +1,12 @@ -module github.com/msalimbene/hlp-721 +module github.com/hyperledger/fabric-samples/token-erc-721/chaincode-go go 1.17 require ( - github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212 + github.com/hyperledger/fabric-chaincode-go v0.0.0-20220131132609-1476cf1d3206 github.com/hyperledger/fabric-contract-api-go v1.1.1 - github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e - github.com/stretchr/testify v1.5.1 + github.com/hyperledger/fabric-protos-go v0.0.0-20220202165055-956c75de7b17 + github.com/stretchr/testify v1.7.0 ) require ( @@ -35,4 +35,5 @@ require ( google.golang.org/genproto v0.0.0-20180831171423-11092d34479b // indirect google.golang.org/grpc v1.23.0 // indirect gopkg.in/yaml.v2 v2.2.8 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/token-erc-721/chaincode-go/go.sum b/token-erc-721/chaincode-go/go.sum index 8f0f31d0..68e78ff4 100644 --- a/token-erc-721/chaincode-go/go.sum +++ b/token-erc-721/chaincode-go/go.sum @@ -43,13 +43,15 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212 h1:1i4lnpV8BDgKOLi1hgElfBqdHXjXieSuj8629mwBZ8o= github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc= +github.com/hyperledger/fabric-chaincode-go v0.0.0-20220131132609-1476cf1d3206 h1:WAERjn+5lTfT8hVw5ik4uozvtei2F836AcRU+5fipmI= +github.com/hyperledger/fabric-chaincode-go v0.0.0-20220131132609-1476cf1d3206/go.mod h1:poNJVTYwPIuHWJH0gyprZZSx70GpdWM2se3u/DEldYc= github.com/hyperledger/fabric-contract-api-go v1.1.1 h1:gDhOC18gjgElNZ85kFWsbCQq95hyUP/21n++m0Sv6B0= github.com/hyperledger/fabric-contract-api-go v1.1.1/go.mod h1:+39cWxbh5py3NtXpRA63rAH7NzXyED+QJx1EZr0tJPo= github.com/hyperledger/fabric-protos-go v0.0.0-20190919234611-2a87503ac7c9/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= -github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e h1:9PS5iezHk/j7XriSlNuSQILyCOfcZ9wZ3/PiucmSE8E= github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= +github.com/hyperledger/fabric-protos-go v0.0.0-20220202165055-956c75de7b17 h1:TJzBJlpsO2wjlq/YyoAVLJCnb9MjeddYW2BHtQmbAI4= +github.com/hyperledger/fabric-protos-go v0.0.0-20220202165055-956c75de7b17/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -90,8 +92,9 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -143,4 +146,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/token-erc-721/chaincode-go/main.go b/token-erc-721/chaincode-go/main.go index c845a2f7..93d03610 100644 --- a/token-erc-721/chaincode-go/main.go +++ b/token-erc-721/chaincode-go/main.go @@ -5,22 +5,21 @@ package main import ( - "github.com/hyperledger/fabric-samples/token-erc-721/chaincode-go/TokenERC721Contract" - "github.com/hyperledger/fabric-contract-api-go/contractapi" "github.com/hyperledger/fabric-contract-api-go/metadata" + "github.com/hyperledger/fabric-samples/token-erc-721/chaincode-go/chaincode" ) func main() { - hlpNftContract := new(chaincode.TokenERC721Contract) - hlpNftContract.Info.Version = "0.0.1" - hlpNftContract.Info.Description = "ERC-721 fabric port" - hlpNftContract.Info.License = new(metadata.LicenseMetadata) - hlpNftContract.Info.License.Name = "Apache-2.0" - hlpNftContract.Info.Contact = new(metadata.ContactMetadata) - hlpNftContract.Info.Contact.Name = "Matias Salimbene" + nftContract := new(chaincode.TokenERC721Contract) + nftContract.Info.Version = "0.0.1" + nftContract.Info.Description = "ERC-721 fabric port" + nftContract.Info.License = new(metadata.LicenseMetadata) + nftContract.Info.License.Name = "Apache-2.0" + nftContract.Info.Contact = new(metadata.ContactMetadata) + nftContract.Info.Contact.Name = "Matias Salimbene" - chaincode, err := contractapi.NewChaincode(hlpNftContract) + chaincode, err := contractapi.NewChaincode(nftContract) chaincode.Info.Title = "ERC-721 chaincode" chaincode.Info.Version = "0.0.1"