Skip to content

Commit

Permalink
Fix client path (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Frozen @alexeykiselev
Frozen authored and alexeykiselev committed Nov 14, 2018
1 parent d8ce8bb commit 4ca74af
Show file tree
Hide file tree
Showing 16 changed files with 356 additions and 72 deletions.
66 changes: 56 additions & 10 deletions pkg/client/addresses.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@ type AddressesBalance struct {

// Balance returns account's balance by its address
func (a *Addresses) Balance(ctx context.Context, address proto.Address) (*AddressesBalance, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("addresses/balance/%s", address.String()))
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/balance/%s", a.options.BaseUrl, address.String()),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand All @@ -58,9 +63,14 @@ type AddressesBalanceDetails struct {

// BalanceDetails returns account's detail balance by its address
func (a *Addresses) BalanceDetails(ctx context.Context, address proto.Address) (*AddressesBalanceDetails, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/balance/details/%s", address.String()))
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/balance/details/%s", a.options.BaseUrl, address.String()),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand All @@ -83,9 +93,14 @@ type AddressesScriptInfo struct {

// ScriptInfo gets account's script information
func (a *Addresses) ScriptInfo(ctx context.Context, address proto.Address) (*AddressesScriptInfo, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/scriptInfo/%s", address.String()))
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/scriptInfo/%s", a.options.BaseUrl, address.String()),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand All @@ -102,9 +117,13 @@ func (a *Addresses) ScriptInfo(ctx context.Context, address proto.Address) (*Add

// Get wallet accounts addresses
func (a *Addresses) Addresses(ctx context.Context) ([]proto.Address, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, "/addresses")
if err != nil {
return nil, nil, err
}
req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses", a.options.BaseUrl),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand All @@ -126,9 +145,13 @@ type AddressesValidate struct {

// Check whether address is valid or not
func (a *Addresses) Validate(ctx context.Context, address proto.Address) (*AddressesValidate, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/validate/%s", address.String()))
if err != nil {
return nil, nil, err
}
req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/validate/%s", a.options.BaseUrl, address.String()),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand All @@ -151,9 +174,13 @@ type AddressesEffectiveBalance struct {

// Account's balance
func (a *Addresses) EffectiveBalance(ctx context.Context, address proto.Address) (*AddressesEffectiveBalance, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/effectiveBalance/%s", address.String()))
if err != nil {
return nil, nil, err
}
req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/effectiveBalance/%s", a.options.BaseUrl, address.String()),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand All @@ -174,9 +201,13 @@ type addressesPublicKey struct {

// Generate address from public key
func (a *Addresses) PublicKey(ctx context.Context, publicKey string) (*proto.Address, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/publicKey/%s", publicKey))
if err != nil {
return nil, nil, err
}
req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/publicKey/%s", a.options.BaseUrl, publicKey),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -207,9 +238,14 @@ func (a *Addresses) SignText(ctx context.Context, address proto.Address, message
return nil, nil, NoApiKeyError
}

url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/signText/%s", address.String()))
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"POST",
fmt.Sprintf("%s/addresses/signText/%s", a.options.BaseUrl, address.String()),
url.String(),
strings.NewReader(message))
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -242,14 +278,19 @@ func (a *Addresses) VerifyText(ctx context.Context, address proto.Address, body
return false, nil, NoApiKeyError
}

url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/verifyText/%s", address.String()))
if err != nil {
return false, nil, err
}

bodyBytes, err := json.Marshal(body)
if err != nil {
return false, nil, err
}

req, err := http.NewRequest(
"POST",
fmt.Sprintf("%s/addresses/verifyText/%s", a.options.BaseUrl, address.String()),
url.String(),
bytes.NewReader(bodyBytes))
if err != nil {
return false, nil, err
Expand Down Expand Up @@ -277,9 +318,14 @@ type BalanceAfterConfirmations struct {
func (a *Addresses) BalanceAfterConfirmations(
ctx context.Context, address proto.Address, confirmations uint64) (*BalanceAfterConfirmations, *Response, error) {

url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/addresses/balance/%s/%d", address.String(), confirmations))
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/addresses/balance/%s/%d", a.options.BaseUrl, address.String(), confirmations),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand Down
20 changes: 10 additions & 10 deletions pkg/client/addresses_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var addressesBalanceDetailsJson = `
func TestAddresses_BalanceDetails(t *testing.T) {
address, _ := proto.NewAddressFromString("3NBVqYXrapgJP9atQccdBPAgJPwHDKkh6A8")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressesBalanceDetailsJson, 200),
})
require.NoError(t, err)
Expand Down Expand Up @@ -51,7 +51,7 @@ var addressesScriptInfoJson = `
func TestAddresses_ScriptInfo(t *testing.T) {
address, _ := proto.NewAddressFromString("3NBVqYXrapgJP9atQccdBPAgJPwHDKkh6A8")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressesScriptInfoJson, 200),
})
require.NoError(t, err)
Expand All @@ -75,7 +75,7 @@ var addressesAddressesJson = `
func TestAddresses_Addresses(t *testing.T) {
address, _ := proto.NewAddressFromString("3MzemqBzJ9h844PparHU1EzGC5SQmtH5pNp")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressesAddressesJson, 200),
})
require.NoError(t, err)
Expand All @@ -96,7 +96,7 @@ var addressesValidateJson = `
func TestAddresses_Validate(t *testing.T) {
address, _ := proto.NewAddressFromString("3P3oWUH9oXRqiByBG7g9hYSDpCFxcT2wTBS")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressesValidateJson, 200),
})
require.NoError(t, err)
Expand All @@ -121,7 +121,7 @@ var addressesBalanceJson = `
func TestAddresses_Balance(t *testing.T) {
address, _ := proto.NewAddressFromString("3NBVqYXrapgJP9atQccdBPAgJPwHDKkh6A8")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressesBalanceJson, 200),
})
require.NoError(t, err)
Expand All @@ -147,7 +147,7 @@ var addressesEffectiveBalance = `
func TestAddresses_EffectiveBalance(t *testing.T) {
address, _ := proto.NewAddressFromString("3NBVqYXrapgJP9atQccdBPAgJPwHDKkh6A8")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressesEffectiveBalance, 200),
})
require.NoError(t, err)
Expand All @@ -173,7 +173,7 @@ func TestAddresses_PublicKey(t *testing.T) {
pubKey := "AF9HLq2Rsv2fVfLPtsWxT7Y3S9ZTv6Mw4ZTp8K8LNdEp"
address, _ := proto.NewAddressFromString("3Mr5af3Y7r7gQej3tRtugYbKaPr5qYps2ei")
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressPublicKeyJson, 200),
})
body, resp, err :=
Expand All @@ -199,7 +199,7 @@ func TestAddresses_SignText(t *testing.T) {
sign, _ := crypto.NewSignatureFromBase58("RP742bUjfrzWcXhnmkbim2dWk9mSUcPcmn77EcsD5t2TBUZqZGe8Vk211hAYbW4FNxWtWqcCmR1Trv8gUXKN6if")
text := "some-text"
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
ApiKey: "ApiKey",
Client: NewMockHttpRequestFromString(addressSignTextJson, 200),
})
Expand Down Expand Up @@ -234,7 +234,7 @@ func TestAddresses_VerifyText(t *testing.T) {
Signature: sign,
}
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
ApiKey: "apiKey",
Client: NewMockHttpRequestFromString(addressVerifyTextJson, 200),
})
Expand All @@ -258,7 +258,7 @@ func TestAddresses_BalanceAfterConfirmations(t *testing.T) {
address, _ := proto.NewAddressFromString("3NBVqYXrapgJP9atQccdBPAgJPwHDKkh6A8")
confirmations := uint64(1)
client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(addressBalanceAfterConfirmationsJson, 200),
})
require.NoError(t, err)
Expand Down
28 changes: 24 additions & 4 deletions pkg/client/alias.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ func NewAlias(options Options) *Alias {
}

func (a *Alias) Get(ctx context.Context, alias string) (proto.Address, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/alias/by-alias/%s", alias))
if err != nil {
return proto.Address{}, nil, err
}

req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/alias/by-alias/%s", a.options.BaseUrl, alias),
url.String(),
nil)
if err != nil {
return proto.Address{}, nil, err
Expand All @@ -42,9 +47,14 @@ func (a *Alias) Get(ctx context.Context, alias string) (proto.Address, *Response
}

func (a *Alias) GetByAddress(ctx context.Context, address proto.Address) ([]*proto.Alias, *Response, error) {
url, err := joinUrl(a.options.BaseUrl, fmt.Sprintf("/alias/by-address/%s", address.String()))
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"GET",
fmt.Sprintf("%s/alias/by-address/%s", a.options.BaseUrl, address.String()),
url.String(),
nil)
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -82,14 +92,19 @@ func (a *Alias) Create(ctx context.Context, createReq AliasCreateReq) (*CreateAl
return nil, nil, NoApiKeyError
}

url, err := joinUrl(a.options.BaseUrl, "/alias/create")
if err != nil {
return nil, nil, err
}

bts, err := json.Marshal(createReq)
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"POST",
fmt.Sprintf("%s/alias/create", a.options.BaseUrl),
url.String(),
bytes.NewReader(bts))
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -120,9 +135,14 @@ func (a *Alias) Broadcast(ctx context.Context, broadcastReq AliasBroadcastReq) (
return nil, nil, err
}

url, err := joinUrl(a.options.BaseUrl, "/alias/broadcast/create")
if err != nil {
return nil, nil, err
}

req, err := http.NewRequest(
"POST",
fmt.Sprintf("%s/alias/broadcast/create", a.options.BaseUrl),
url.String(),
bytes.NewReader(bts))
if err != nil {
return nil, nil, err
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/alias_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestAlias_Broadcast(t *testing.T) {
require.Nil(t, err)

client, err := NewClient(Options{
BaseUrl: "https://testnode1.wavesnodes.com",
BaseUrl: "https://testnode1.wavesnodes.com/",
Client: NewMockHttpRequestFromString(broadcastResp, 200),
})

Expand Down
Loading

0 comments on commit 4ca74af

Please sign in to comment.