aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

rpc: remove wrappers package, move things to result

Browse source 
These are all RPC call results, `wrappers` package doesn't make much sense to
me.
This commit is contained in:
Roman Khimov 2020-01-13 13:21:44 +03:00
parent b8f7ab8e6a
commit 1801e545a0
11 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/rpc/neoScanBalanceGetter.go
View file

@ -8,7 +8,7 @@ import (
"github.com/CityOfZion/neo-go/pkg/core/state"
"github.com/CityOfZion/neo-go/pkg/core/transaction"
"github.com/CityOfZion/neo-go/pkg/rpc/wrappers"
"github.com/CityOfZion/neo-go/pkg/rpc/result"
"github.com/CityOfZion/neo-go/pkg/util"
errs "github.com/pkg/errors"
)
@ -57,7 +57,7 @@ func (s NeoScanServer) CalculateInputs(address string, assetIDUint util.Uint256,
err error
us []*Unspent
assetUnspent Unspent
assetID = wrappers.GlobalAssets[assetIDUint.StringLE()]
assetID = result.GlobalAssets[assetIDUint.StringLE()]
)
if us, err = s.GetBalance(address); err != nil {
return nil, util.Fixed8(0), errs.Wrapf(err, "Cannot get balance for address %v", address)

2
pkg/rpc/wrappers/account_state.go → pkg/rpc/result/account_state.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"bytes"

2
pkg/rpc/wrappers/asset_state.go → pkg/rpc/result/asset_state.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"github.com/CityOfZion/neo-go/pkg/core/state"

2
pkg/rpc/wrappers/block.go → pkg/rpc/result/block.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"strconv"

2
pkg/rpc/wrappers/contract_state.go → pkg/rpc/result/contract_state.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"github.com/CityOfZion/neo-go/pkg/core/state"

2
pkg/rpc/wrappers/tx_output.go → pkg/rpc/result/tx_output.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"github.com/CityOfZion/neo-go/pkg/core/transaction"

2
pkg/rpc/wrappers/tx_raw_output.go → pkg/rpc/result/tx_raw_output.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"github.com/CityOfZion/neo-go/pkg/core"

2
pkg/rpc/wrappers/unspents.go → pkg/rpc/result/unspents.go
View file

@ -1,4 +1,4 @@
package wrappers
package result
import (
"github.com/CityOfZion/neo-go/pkg/core"

17
pkg/rpc/server.go
View file

@ -15,7 +15,6 @@ import (
"github.com/CityOfZion/neo-go/pkg/io"
"github.com/CityOfZion/neo-go/pkg/network"
"github.com/CityOfZion/neo-go/pkg/rpc/result"
"github.com/CityOfZion/neo-go/pkg/rpc/wrappers"
"github.com/CityOfZion/neo-go/pkg/util"
"github.com/pkg/errors"
"go.uber.org/zap"
@ -153,7 +152,7 @@ Methods:
}
if len(reqParams) == 2 && reqParams[1].Value == 1 {
results = wrappers.NewBlock(block, s.chain)
results = result.NewBlock(block, s.chain)
} else {
writer := io.NewBufBinWriter()
block.EncodeBinary(writer.BinWriter)
@ -228,7 +227,7 @@ Methods:
as := s.chain.GetAssetState(paramAssetID)
if as != nil {
results = wrappers.NewAssetState(as)
results = result.NewAssetState(as)
} else {
resultsErr = NewRPCError("Unknown asset", "", nil)
}
@ -334,10 +333,10 @@ func (s *Server) getrawtransaction(reqParams Params) (interface{}, error) {
if v == 0 || v == "0" || v == 0.0 || v == false || v == "false" {
results = hex.EncodeToString(tx.Bytes())
} else {
results = wrappers.NewTransactionOutputRaw(tx, header, s.chain)
results = result.NewTransactionOutputRaw(tx, header, s.chain)
}
default:
results = wrappers.NewTransactionOutputRaw(tx, header, s.chain)
results = result.NewTransactionOutputRaw(tx, header, s.chain)
}
} else {
results = hex.EncodeToString(tx.Bytes())
@ -377,7 +376,7 @@ func (s *Server) getTxOut(ps Params) (interface{}, error) {
}
out := tx.Outputs[num]
return wrappers.NewTxOutput(&out), nil
return result.NewTxOutput(&out), nil
}
// getContractState returns contract state (contract information, according to the contract script hash).
@ -392,7 +391,7 @@ func (s *Server) getContractState(reqParams Params) (interface{}, error) {
} else {
cs := s.chain.GetContractState(scriptHash)
if cs != nil {
results = wrappers.NewContractState(cs)
results = result.NewContractState(cs)
} else {
return nil, NewRPCError("Unknown contract", "", nil)
}
@ -420,9 +419,9 @@ func (s *Server) getAccountState(reqParams Params, unspents bool) (interface{},
if err != nil {
return nil, errInvalidParams
}
results = wrappers.NewUnspents(as, s.chain, str)
results = result.NewUnspents(as, s.chain, str)
} else {
results = wrappers.NewAccountState(as)
results = result.NewAccountState(as)
}
}
return results, resultsErr

3
pkg/rpc/server_helper_test.go
View file

@ -12,7 +12,6 @@ import (
"github.com/CityOfZion/neo-go/pkg/io"
"github.com/CityOfZion/neo-go/pkg/network"
"github.com/CityOfZion/neo-go/pkg/rpc/result"
"github.com/CityOfZion/neo-go/pkg/rpc/wrappers"
"github.com/CityOfZion/neo-go/pkg/util"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"
@ -90,7 +89,7 @@ type StringResultResponse struct {
// GetBlockResponse struct for testing.
type GetBlockResponse struct {
Jsonrpc string `json:"jsonrpc"`
Result wrappers.Block `json:"result"`
Result result.Block `json:"result"`
ID int `json:"id"`
}

6
pkg/rpc/types.go
View file

@ -2,7 +2,7 @@ package rpc
import (
"github.com/CityOfZion/neo-go/pkg/core/transaction"
"github.com/CityOfZion/neo-go/pkg/rpc/wrappers"
"github.com/CityOfZion/neo-go/pkg/rpc/result"
"github.com/CityOfZion/neo-go/pkg/vm"
)
@ -32,7 +32,7 @@ type AccountStateResponse struct {
type UnspentResponse struct {
responseHeader
Error *Error `json:"error,omitempty"`
Result *wrappers.Unspents `json:"result,omitempty"`
Result *result.Unspents `json:"result,omitempty"`
}
// Account represents details about a NEO account.
@ -100,7 +100,7 @@ type GetRawTxResponse struct {
type GetTxOutResponse struct {
responseHeader
Error *Error
Result *wrappers.TransactionOutput
Result *result.TransactionOutput
}
// RawTxResponse stores transaction with blockchain metadata to be sent as a response.