Skip to content

Bitso refactor better separation of concerns #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Punksolid merged 1 commit into from
Jan 31, 2024
Merged

Bitso refactor better separation of concerns #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions BitsoAPI/Bitso.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public function account_status(): array
$JSONPayload = '';
$type = 'PRIVATE';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}


Expand Down Expand Up @@ -176,7 +176,7 @@ public function fees(): array
$HTTPMethod = 'GET';
$JSONPayload = '';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}


Expand Down Expand Up @@ -208,7 +208,7 @@ public function withdrawals(
$RequestPath = '/api/v3/withdrawals/?'.$parameters;
$HTTPMethod = 'GET';

return Client::getData($path, $RequestPath, $HTTPMethod, '', $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, '');
}

public function fundings($params = []): array
Expand Down Expand Up @@ -244,7 +244,7 @@ public function fundings($params = []): array
$JSONPayload = '';
$type = 'PRIVATE';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function user_trades($params = [], $ids = []): array
Expand Down Expand Up @@ -275,7 +275,7 @@ public function user_trades($params = [], $ids = []): array
$JSONPayload = '';
$type = 'PRIVATE';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function open_orders($params): array
Expand All @@ -297,7 +297,7 @@ public function open_orders($params): array
$JSONPayload = '';
$type = 'PRIVATE';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function lookup_order($ids)
Expand All @@ -319,7 +319,7 @@ public function lookup_order($ids)
$JSONPayload = '';
$type = 'PRIVATE';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function cancel_order($ids): array
Expand All @@ -336,7 +336,7 @@ public function cancel_order($ids): array
$HTTPMethod = 'DELETE';
$JSONPayload = '';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function place_order($params): array
Expand All @@ -346,7 +346,7 @@ public function place_order($params): array
$HTTPMethod = 'POST';
$JSONPayload = json_encode($params, JSON_THROW_ON_ERROR);

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function fundingDestination($params): array
Expand All @@ -368,7 +368,7 @@ public function fundingDestination($params): array
$JSONPayload = '';
$type = 'PRIVATE';

return Client::getData($path, $RequestPath, $HTTPMethod, $JSONPayload, $this);
return Client::getData($this, $path, $RequestPath, $HTTPMethod, $JSONPayload);
}

public function setCredentials($key, $secret): static
Expand Down
2 changes: 1 addition & 1 deletion BitsoAPI/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static function checkAndDecode($result)


// All the other API methods...
public static function getData($path, $RequestPath, $HTTPMethod, $JSONPayload = '', Bitso $instance): array
public static function getData(Bitso $instance, $path, $RequestPath, $HTTPMethod, $JSONPayload = ''): array
{
$nonce = self::makeNonce();
$message = $nonce . $HTTPMethod . $RequestPath . $JSONPayload;
Expand Down