TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests 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 19397ec4a8
commit 6d202ad4c5
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

@ -34,7 +34,6 @@ type Client struct {
cli *http.Client
endpoint *url.URL
ctx context.Context
version string
wifMu *sync.Mutex
wif *keys.WIF
balancer request.BalanceGetter
@ -59,10 +58,6 @@ type Options struct {
CACert string
DialTimeout 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
}
// cache stores cache values for the RPC client methods
@ -92,10 +87,6 @@ func New(ctx context.Context, endpoint string, opts Options) (*Client, error) {
opts.RequestTimeout = defaultRequestTimeout
}
if opts.Version == "" {
opts.Version = defaultClientVersion
}
httpClient := &http.Client{
Transport: &http.Transport{
DialContext: (&net.Dialer{
@ -114,7 +105,6 @@ func New(ctx context.Context, endpoint string, opts Options) (*Client, error) {
cli: httpClient,
wifMu: new(sync.Mutex),
endpoint: url,
version: opts.Version,
}
if opts.Balancer == nil {
opts.Balancer = cl
@ -172,7 +162,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 {
var (
r = request.Raw{
JSONRPC: c.version,
JSONRPC: request.JSONRPCVersion,
Method: method,
RawParams: p.Values,
ID: 1,