edit some routes

Author: Aseyed

extractors/susy/bridge/common.go

@@ -138,8 +138,8 @@ func ValidateSolanaAddress(address string) bool {
 	return true
 }
 
-func ValidateErgoAddress(address string) bool {
-	isValid, err := helpers.ValidateErgoAddress(address)
+func ValidateErgoAddress(address string, proxyUrl string) bool {
+	isValid, err := helpers.ValidateErgoAddress(address, proxyUrl)
 	if err != nil {
 		fmt.Printf("error: %v", err)
 		return false

extractors/susy/bridge/ergo.go

@@ -72,7 +72,7 @@ func (provider *ErgoToErgoExtractionBridge) pickRequestFromLUPortQueue(luRequest
 		if isExist(luRequest) {
 			continue
 		}
-		isValid := ValidateErgoAddress(luRequest.Receiver)
+		isValid := ValidateErgoAddress(luRequest.Receiver, provider.config.SourceNodeUrl)
 		if !isValid {
 			continue
 		}
@@ -104,7 +104,7 @@ func (provider *ErgoToErgoExtractionBridge) pickRequestFromIBPortQueue(ibRequest
 		if isExist(ibRequest) {
 			continue
 		}
-		isValid := ValidateErgoAddress(ibRequest.Receiver)
+		isValid := ValidateErgoAddress(ibRequest.Receiver, provider.config.DestinationNodeUrl)
 		if !isValid {
 			continue
 		}

extractors/susy/bridge/ergo_test.go

@@ -65,8 +65,8 @@ func TestErgoToErgoExtractionBridge_ExtractReverseTransferRequest(t *testing.T)
 			cmd := ConfigureCommand{
 				SourceDecimals:      9,
 				DestinationDecimals: 9,
-				SourceNodeUrl:       "http://176.9.65.58:9017",
-				DestinationNodeUrl:  "http://176.9.65.58:9016",
+				SourceNodeUrl:       "",
+				DestinationNodeUrl:  "",
 				IBPortAddress:       "ibport",
 				LUPortAddress:       "luport",
 			}
@@ -106,8 +106,8 @@ func TestErgoToErgoExtractionBridge_ExtractDirectTransferRequest(t *testing.T) {
 			cmd := ConfigureCommand{
 				SourceDecimals:      9,
 				DestinationDecimals: 9,
-				SourceNodeUrl:       "http://176.9.65.58:9017",
-				DestinationNodeUrl:  "http://176.9.65.58:9016",
+				SourceNodeUrl:       "",
+				DestinationNodeUrl:  "",
 				IBPortAddress:       "ibport",
 				LUPortAddress:       "luport",
 			}

helpers/ergo.go

@@ -26,7 +26,7 @@ type ErgOptions struct {
 }
 
 var DefaultOptions = ErgOptions{
-	BaseUrl: "http://176.9.65.58:9016",
+	BaseUrl: "",
 	Doer:    &http.Client{Timeout: 30 * time.Second},
 }
 
@@ -90,39 +90,11 @@ func NewClient(options ...ErgOptions) (*ErgClient, error) {
 	return c, nil
 }
 
-func GetDataType(ctx context.Context) (int, error) {
-	type Result struct {
-		Success  bool `json:"success"`
-		DataType int  `json:"dataType"`
-	}
-	client, err := NewClient()
-	if err != nil {
-		return 0, err
-	}
-	url, err := JoinUrl(client.Options.BaseUrl, "adaptor/getDataType")
-	if err != nil {
-		return 0, err
-	}
-	req, err := http.NewRequestWithContext(ctx, "GET", url.String(), nil)
-	result := new(Result)
-	_, err = client.Do(req, result)
-	if err != nil {
-		return 0, err
-	}
-	if !result.Success {
-		return 0, errors.New("can't get lastRound")
-	}
-	return result.DataType, nil
-}
 
 func (client ErgClient) GetOptions() ErgOptions {
 	return client.Options
 }
 
-func withContext(ctx context.Context, req *http.Request) *http.Request {
-	return req.WithContext(ctx)
-}
-
 func newResponse(response *http.Response) *Response {
 	return &Response{
 		Response: response,
@@ -135,13 +107,13 @@ type Request struct {
 	Receiver  string `json:"receiver"`
 }
 
-func ValidateErgoAddress(address string) (bool, error) {
+func ValidateErgoAddress(address string, peorxyUrl string) (bool, error) {
 	type Result struct {
 		Success bool `json:"success"`
 		IsValid bool `json:"isValid"`
 	}
 
-	url := fmt.Sprintf("%s/%s", DefaultOptions.BaseUrl, "adaptor/validateAddress")
+	url := fmt.Sprintf("%s/%s", peorxyUrl, "validateAddress")
 
 	values := map[string]string{"address": address}
 	jsonValue, _ := json.Marshal(values)