TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

rpc: move validateAddress() function from wrappers into server

Browse source 
It's a server implementation detail, it has nothing to do with the data format
itself. It also makes no sense exporing it.
This commit is contained in:
Roman Khimov 2020-01-13 11:27:22 +03:00
parent 72a62f1292
commit bfa2d54e16
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/rpc/server.go
View file

@ -11,6 +11,7 @@ import (
"github.com/CityOfZion/neo-go/pkg/core"
"github.com/CityOfZion/neo-go/pkg/core/state"
"github.com/CityOfZion/neo-go/pkg/core/transaction"
"github.com/CityOfZion/neo-go/pkg/encoding/address"
"github.com/CityOfZion/neo-go/pkg/io"
"github.com/CityOfZion/neo-go/pkg/network"
"github.com/CityOfZion/neo-go/pkg/rpc/result"
@ -209,7 +210,7 @@ Methods:
resultsErr = errInvalidParams
break Methods
}
results = wrappers.ValidateAddress(param.Value)
results = validateAddress(param.Value)
case "getassetstate":
getassetstateCalled.Inc()
@ -551,3 +552,14 @@ func (s *Server) blockHeightFromParam(param *Param) (int, error) {
}
return num, nil
}
// validateAddress verifies that the address is a correct NEO address
// see https://docs.neo.org/en-us/node/cli/2.9.4/api/validateaddress.html
func validateAddress(addr interface{}) wrappers.ValidateAddressResponse {
resp := wrappers.ValidateAddressResponse{Address: addr}
if addr, ok := addr.(string); ok {
_, err := address.StringToUint160(addr)
resp.IsValid = (err == nil)
}
return resp
}

19
pkg/rpc/wrappers/validate_address.go
View file

@ -1,22 +1,9 @@
package wrappers
import (
"github.com/CityOfZion/neo-go/pkg/encoding/address"
)
// ValidateAddressResponse represents response to validate address call.
// ValidateAddressResponse represents response to validate address call. Notice
// Address is an interface{} here because server echoes back whatever address
// value user has sent to it, even if it's not a string.
type ValidateAddressResponse struct {
Address interface{} `json:"address"`
IsValid bool `json:"isvalid"`
}
// ValidateAddress verifies that the address is a correct NEO address
// see https://docs.neo.org/en-us/node/cli/2.9.4/api/validateaddress.html
func ValidateAddress(addr interface{}) ValidateAddressResponse {
resp := ValidateAddressResponse{Address: addr}
if addr, ok := addr.(string); ok {
_, err := address.StringToUint160(addr)
resp.IsValid = err == nil
}
return resp
}