change eoptions as options;resolved review

xyq-c-cpp · xyq-c-cpp · commit 26c5b2feab1c · 2024-06-20T09:41:31.000+08:00
diff --git a/README.md b/README.md
@@ -23,10 +23,10 @@ Name | Description | Status
 [margin-api.md](https://binance-docs.github.io/apidocs/spot/en) | Details on the Margin API (/sapi) | <input type="checkbox" checked>  Implemented
 [futures-api.md](https://binance-docs.github.io/apidocs/futures/en/#general-info) | Details on the Futures API (/fapi) | <input type="checkbox" checked>  Implemented
 [delivery-api.md](https://binance-docs.github.io/apidocs/delivery/en/#general-info) | Details on the Coin-M Futures API (/dapi) | <input type="checkbox" checked>  Implemented
-[eoptions-api.md](https://binance-docs.github.io/apidocs/voptions/en/#general-info) | Detains on the European Options API(/eapi) | <input type="checkbox" checked>  Implemented  
+[options-api.md](https://binance-docs.github.io/apidocs/voptions/en/#general-info) | Detains on the Options API(/eapi) | <input type="checkbox" checked>  Implemented  
 
   
-Found an unimplemented interface, please submit a issue.
+If you find an unimplemented interface, please submit an issue.
 
 ### Installation
 
@@ -49,7 +49,7 @@ import (
     
     "github.com/adshao/go-binance/v2/futures" // optional package
     "github.com/adshao/go-binance/v2/delivery" // optional package
-    "github.com/adshao/go-binance/v2/eoptions" // optional package
+    "github.com/adshao/go-binance/v2/options" // optional package
 )
 ```
 
@@ -84,7 +84,7 @@ If you have any questions, please refer to the specific version of the code for
 ##### Proxy Client
   
 ```
-proxyUrl := "http://127.0.0.1:7890" // for example, please replace as your exact proxy url.
+proxyUrl := "http://127.0.0.1:7890" // Please replace it with your exact proxy URL.
 client := binance.NewProxiedClient(apiKey, apiSecret, proxyUrl)
 ```
   
@@ -236,9 +236,9 @@ fmt.Println(res)
 
 You don't need Client in websocket API. Just call binance.WsXxxServe(args, handler, errHandler).
 
-> For delivery API you can use `delivery.WsXxxServe(args, handler, errHandler)`.  
+> For delivery API you can use `delivery.WsXxxServe(args, handler, errHandler)`.
 
-If you wanna use proxy, you can set `HTTPS_PROXY` or `HTTP_PROXY` in environment variable or you can call `SetWsProxyUrl` of target packages in code. Then you can call other websocket function. For example below:
+If you want to use a proxy, you can set `HTTPS_PROXY` or `HTTP_PROXY` in the environment variable, or you can call `SetWsProxyUrl` in the target packages within your code. Then you can call other websocket functions. For example:
 ```golang
 binance.SetWsProxyUrl("http://127.0.0.1:7890")
 binance.WsDepthServe("LTCBTC", wsDepthHandler, errHandler)
diff --git a/v2/client.go b/v2/client.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/adshao/go-binance/v2/common"
 	"github.com/adshao/go-binance/v2/delivery"
-	"github.com/adshao/go-binance/v2/eoptions"
+	"github.com/adshao/go-binance/v2/options"
 	"github.com/adshao/go-binance/v2/futures"
 )
 
@@ -362,9 +362,9 @@ func NewDeliveryClient(apiKey, secretKey string) *delivery.Client {
 	return delivery.NewClient(apiKey, secretKey)
 }
 
-// NewOptionsClient initialize client for eoptions API
-func NewOptionsClient(apiKey, secretKey string) *eoptions.Client {
-	return eoptions.NewClient(apiKey, secretKey)
+// NewOptionsClient initialize client for options API
+func NewOptionsClient(apiKey, secretKey string) *options.Client {
+	return options.NewClient(apiKey, secretKey)
 }
 
 type doFunc func(req *http.Request) (*http.Response, error)
diff --git a/v2/options/account_service.go b/v2/options/account_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/account_service_test.go b/v2/options/account_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/client.go b/v2/options/client.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"bytes"
diff --git a/v2/options/client_test.go b/v2/options/client_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"bytes"
diff --git a/v2/options/depth_service.go b/v2/options/depth_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/depth_service_test.go b/v2/options/depth_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/exchange_info_service.go b/v2/options/exchange_info_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/exchange_info_service_test.go b/v2/options/exchange_info_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/exercise_history_service.go b/v2/options/exercise_history_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/exercise_history_service_test.go b/v2/options/exercise_history_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/index_service.go b/v2/options/index_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/index_service_test.go b/v2/options/index_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/kline_service.go b/v2/options/kline_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/kline_service_test.go b/v2/options/kline_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/mark_service.go b/v2/options/mark_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/mark_service_test.go b/v2/options/mark_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/open_interest_service.go b/v2/options/open_interest_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/open_interest_service_test.go b/v2/options/open_interest_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/order_service.go b/v2/options/order_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/order_service_test.go b/v2/options/order_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"encoding/json"
diff --git a/v2/options/request.go b/v2/options/request.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"fmt"
diff --git a/v2/options/server_service.go b/v2/options/server_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/server_service_test.go b/v2/options/server_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/ticker_service.go b/v2/options/ticker_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/ticker_service_test.go b/v2/options/ticker_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/trade_service_test.go b/v2/options/trade_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/trades_service.go b/v2/options/trades_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/user_stream_service.go b/v2/options/user_stream_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"context"
diff --git a/v2/options/user_stream_service_test.go b/v2/options/user_stream_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"testing"
diff --git a/v2/options/websocket.go b/v2/options/websocket.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"net/http"
diff --git a/v2/options/websocket_service.go b/v2/options/websocket_service.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"encoding/json"
@@ -10,9 +10,9 @@ import (
 
 // Endpoints
 const (
-	baseWsMainUrl          = "wss://nbstream.binance.com/eoptions/ws"
+	baseWsMainUrl          = "wss://nbstream.binance.com/options/ws"
 	baseWsTestnetUrl       = "" // unknown now
-	baseCombinedMainURL    = "wss://nbstream.binance.com/eoptions/stream?streams="
+	baseCombinedMainURL    = "wss://nbstream.binance.com/options/stream?streams="
 	baseCombinedTestnetURL = "" // unknown now
 )
 
diff --git a/v2/options/websocket_service_test.go b/v2/options/websocket_service_test.go
@@ -1,4 +1,4 @@
-package eoptions
+package options
 
 import (
 	"errors"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`
`20`	`20`	`"github.com/adshao/go-binance/v2/common"`
`21`	`21`	`"github.com/adshao/go-binance/v2/delivery"`
`22`		`- "github.com/adshao/go-binance/v2/eoptions"`
	`22`	`+ "github.com/adshao/go-binance/v2/options"`
`23`	`23`	`"github.com/adshao/go-binance/v2/futures"`
`24`	`24`	`)`
`25`	`25`
`@@ -362,9 +362,9 @@ func NewDeliveryClient(apiKey, secretKey string) *delivery.Client {`
`362`	`362`	`return delivery.NewClient(apiKey, secretKey)`
`363`	`363`	`}`
`364`	`364`
`365`		`-// NewOptionsClient initialize client for eoptions API`
`366`		`-func NewOptionsClient(apiKey, secretKey string) *eoptions.Client {`
`367`		`- return eoptions.NewClient(apiKey, secretKey)`
	`365`	`+// NewOptionsClient initialize client for options API`
	`366`	`+func NewOptionsClient(apiKey, secretKey string) *options.Client {`
	`367`	`+ return options.NewClient(apiKey, secretKey)`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`type doFunc func(req http.Request) (http.Response, error)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package eoptions`
	`1`	`+package options`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`