Merge pull request #28 from ipfs-force-community/feat/new_template_cmd

Feat/new template cmd
ipfs-force-community · Jun 22, 2022 · e42fdd2 · e42fdd2
2 parents 4e719f2 + cbf0095
commit e42fdd2
Show file tree

Hide file tree

Showing 19 changed files with 384 additions and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/erc20/client/client.go b/examples/erc20/client/client.go
@@ -1,10 +1,10 @@
 package client
 
 import (
-	bytes "bytes"
-	context "context"
+	"bytes"
+	"context"
 	contract "erc20/contract"
-	fmt "fmt"
+	"fmt"
 
 	address "github.com/filecoin-project/go-address"
 	abi "github.com/filecoin-project/go-state-types/abi"
@@ -13,7 +13,7 @@ import (
 	init8 "github.com/filecoin-project/specs-actors/v8/actors/builtin/init"
 	actors "github.com/filecoin-project/venus/venus-shared/actors"
 	types "github.com/filecoin-project/venus/venus-shared/types"
-	types2 "github.com/ipfs-force-community/go-fvm-sdk/sdk/types"
+	sdkTypes "github.com/ipfs-force-community/go-fvm-sdk/sdk/types"
 	cid "github.com/ipfs/go-cid"
 	typegen "github.com/whyrusleeping/cbor-gen"
 
@@ -31,9 +31,9 @@ type IErc20TokenClient interface {
 
 	Constructor(context.Context, *contract.ConstructorReq) error
 
-	GetName(context.Context) (types2.CborString, error)
+	GetName(context.Context) (sdkTypes.CborString, error)
 
-	GetSymbol(context.Context) (types2.CborString, error)
+	GetSymbol(context.Context) (sdkTypes.CborString, error)
 
 	GetDecimal(context.Context) (typegen.CborInt, error)
 
@@ -208,7 +208,7 @@ func (c *Erc20TokenClient) Constructor(ctx context.Context, p0 *contract.Constru
 	return nil
 }
 
-func (c *Erc20TokenClient) GetName(ctx context.Context) (types2.CborString, error) {
+func (c *Erc20TokenClient) GetName(ctx context.Context) (sdkTypes.CborString, error) {
 	if c.actor == address.Undef {
 		return "", fmt.Errorf("unset actor address for call")
 	}
@@ -239,14 +239,14 @@ func (c *Erc20TokenClient) GetName(ctx context.Context) (types2.CborString, erro
 		return "", fmt.Errorf("expect get result for call")
 	}
 
-	result := new(types2.CborString)
+	result := new(sdkTypes.CborString)
 	result.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return))
 
 	return *result, nil
 
 }
 
-func (c *Erc20TokenClient) GetSymbol(ctx context.Context) (types2.CborString, error) {
+func (c *Erc20TokenClient) GetSymbol(ctx context.Context) (sdkTypes.CborString, error) {
 	if c.actor == address.Undef {
 		return "", fmt.Errorf("unset actor address for call")
 	}
@@ -277,7 +277,7 @@ func (c *Erc20TokenClient) GetSymbol(ctx context.Context) (types2.CborString, er
 		return "", fmt.Errorf("expect get result for call")
 	}
 
-	result := new(types2.CborString)
+	result := new(sdkTypes.CborString)
 	result.UnmarshalCBOR(bytes.NewReader(wait.Receipt.Return))
 
 	return *result, nil

diff --git a/examples/erc20/entry.go b/examples/erc20/entry.go
diff --git a/examples/erc20/gen/go.mod b/examples/erc20/gen/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect

diff --git a/examples/erc20/gen/go.sum b/examples/erc20/gen/go.sum
@@ -1283,6 +1283,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=