From 98a1e2170a0f09183b3c30c1beee18773d2a3b56 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 17 Feb 2020 14:42:57 +0300 Subject: [PATCH] rpc: move ContractDetails to request/ package --- cli/smartcontract/smart_contract.go | 6 +++--- pkg/rpc/{ => request}/scdetails.go | 8 +++----- pkg/rpc/txBuilder.go | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) rename pkg/rpc/{ => request}/scdetails.go (66%) diff --git a/cli/smartcontract/smart_contract.go b/cli/smartcontract/smart_contract.go index b3e31a028..d91abc333 100644 --- a/cli/smartcontract/smart_contract.go +++ b/cli/smartcontract/smart_contract.go @@ -477,11 +477,11 @@ func testInvokeScript(ctx *cli.Context) error { // ProjectConfig contains project metadata. type ProjectConfig struct { Version uint - Contract rpc.ContractDetails `yaml:"project"` + Contract request.ContractDetails `yaml:"project"` } -func parseContractDetails() rpc.ContractDetails { - details := rpc.ContractDetails{} +func parseContractDetails() request.ContractDetails { + details := request.ContractDetails{} reader := bufio.NewReader(os.Stdin) fmt.Print("Author: ") diff --git a/pkg/rpc/scdetails.go b/pkg/rpc/request/scdetails.go similarity index 66% rename from pkg/rpc/scdetails.go rename to pkg/rpc/request/scdetails.go index f5cd242c8..f6f910aff 100644 --- a/pkg/rpc/scdetails.go +++ b/pkg/rpc/request/scdetails.go @@ -1,6 +1,4 @@ -package rpc - -import "github.com/CityOfZion/neo-go/pkg/rpc/request" +package request // ContractDetails contains contract metadata. type ContractDetails struct { @@ -12,6 +10,6 @@ type ContractDetails struct { HasStorage bool HasDynamicInvocation bool IsPayable bool - ReturnType request.StackParamType - Parameters []request.StackParamType + ReturnType StackParamType + Parameters []StackParamType } diff --git a/pkg/rpc/txBuilder.go b/pkg/rpc/txBuilder.go index a641592a3..f93e7a89a 100644 --- a/pkg/rpc/txBuilder.go +++ b/pkg/rpc/txBuilder.go @@ -110,7 +110,7 @@ func GetInvocationScript(tx *transaction.Transaction, wif *keys.WIF) ([]byte, er // CreateDeploymentScript returns a script that deploys given smart contract // with its metadata. -func CreateDeploymentScript(avm []byte, contract *ContractDetails) ([]byte, error) { +func CreateDeploymentScript(avm []byte, contract *request.ContractDetails) ([]byte, error) { var props smartcontract.PropertyState script := io.NewBufBinWriter()