TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-12-12 21:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpc/client: drop Version from Options

Browse source 
It makes no sense at all, it's a JSON-RPC version.
This commit is contained in:
Roman Khimov 2020-04-29 18:17:18 +03:00
parent e32367a1c2
commit 38f9b511ae
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/rpc/client/client.go
View file

@ -32,7 +32,6 @@ type Client struct {
cli *http.Client cli *http.Client
endpoint *url.URL endpoint *url.URL
ctx context.Context ctx context.Context
version string
wifMu *sync.Mutex wifMu *sync.Mutex
wif *keys.WIF wif *keys.WIF
balancer request.BalanceGetter balancer request.BalanceGetter
@ -56,10 +55,6 @@ type Options struct {
CACert string CACert string
DialTimeout time.Duration DialTimeout time.Duration
RequestTimeout time.Duration RequestTimeout time.Duration
// Version is the version of the client that will be send
// along with the request body. If no version is specified
// the default version (currently 2.0) will be used.
Version string
} }
// New returns a new Client ready to use. // New returns a new Client ready to use.
@ -77,10 +72,6 @@ func New(ctx context.Context, endpoint string, opts Options) (*Client, error) {
opts.RequestTimeout = defaultRequestTimeout opts.RequestTimeout = defaultRequestTimeout
} }
if opts.Version == "" {
opts.Version = defaultClientVersion
}
httpClient := &http.Client{ httpClient := &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
DialContext: (&net.Dialer{ DialContext: (&net.Dialer{
@ -99,7 +90,6 @@ func New(ctx context.Context, endpoint string, opts Options) (*Client, error) {
cli: httpClient, cli: httpClient,
wifMu: new(sync.Mutex), wifMu: new(sync.Mutex),
endpoint: url, endpoint: url,
version: opts.Version,
} }
if opts.Balancer == nil { if opts.Balancer == nil {
opts.Balancer = cl opts.Balancer = cl
@ -157,7 +147,7 @@ func (c *Client) CalculateInputs(address string, asset util.Uint256, cost util.F
func (c *Client) performRequest(method string, p request.RawParams, v interface{}) error { func (c *Client) performRequest(method string, p request.RawParams, v interface{}) error {
var ( var (
r = request.Raw{ r = request.Raw{
JSONRPC: c.version, JSONRPC: request.JSONRPCVersion,
Method: method, Method: method,
RawParams: p.Values, RawParams: p.Values,
ID: 1, ID: 1,