Merge pull request #39 from SIDANWhatever/feature/issue-12

fix: aligning return type with code cleaning
maestro-org · Feb 13, 2024 · fe9032d · fe9032d
2 parents e307364 + f96a1cb
commit fe9032d
Show file tree

Hide file tree

Showing 29 changed files with 314 additions and 517 deletions.
diff --git a/.gitignore b/.gitignore
@@ -104,3 +104,6 @@ dist
 .tern-port
 
 package-lock.json
+
+# local testing
+test.ts
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@maestro-org/typescript-sdk",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "TypeScript SDK for the Maestro Dapp Platform",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -49,4 +49,4 @@
       "yarn eslint --fix"
     ]
   }
-}
+}
diff --git a/src/api/accounts/helpers.ts b/src/api/accounts/helpers.ts
@@ -1,4 +1,4 @@
-import { AxiosRequestConfig, AxiosInstance, AxiosPromise } from 'axios';
+import { AxiosRequestConfig } from 'axios';
 import { RequestArgs } from '../../base';
 import {
     assertParamExists,
@@ -39,11 +39,11 @@ export const AccountsApiAxiosParamCreator = (configuration: Configuration) => ({
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    accountAddresses: async (
+    accountAddresses: (
         stakeAddr: string,
         localVarQueryParameter: AccountAddressesQueryParams = {},
         options: AxiosRequestConfig = {},
-    ): Promise<RequestArgs> => {
+    ): RequestArgs => {
         // verify required parameter 'stakeAddr' is not null or undefined
         assertParamExists('accountAddresses', 'stakeAddr', stakeAddr);
         const localVarPath = `/accounts/{stake_addr}/addresses`.replace(
@@ -81,11 +81,11 @@ export const AccountsApiAxiosParamCreator = (configuration: Configuration) => ({
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    accountAssets: async (
+    accountAssets: (
         stakeAddr: string,
         localVarQueryParameter: AccountAssetsQueryParams = {},
         options: AxiosRequestConfig = {},
-    ): Promise<RequestArgs> => {
+    ): RequestArgs => {
         // verify required parameter 'stakeAddr' is not null or undefined
         assertParamExists('accountAssets', 'stakeAddr', stakeAddr);
         const localVarPath = `/accounts/{stake_addr}/assets`.replace(
@@ -124,11 +124,11 @@ export const AccountsApiAxiosParamCreator = (configuration: Configuration) => ({
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    accountHistory: async (
+    accountHistory: (
         stakeAddr: string,
         localVarQueryParameter: AccountHistoryQueryParams = {},
         options: AxiosRequestConfig = {},
-    ): Promise<RequestArgs> => {
+    ): RequestArgs => {
         // verify required parameter 'stakeAddr' is not null or undefined
         assertParamExists('accountHistory', 'stakeAddr', stakeAddr);
         const localVarPath = `/accounts/{stake_addr}/history`.replace(
@@ -165,7 +165,7 @@ export const AccountsApiAxiosParamCreator = (configuration: Configuration) => ({
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    accountInfo: async (stakeAddr: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+    accountInfo: (stakeAddr: string, options: AxiosRequestConfig = {}): RequestArgs => {
         // verify required parameter 'stakeAddr' is not null or undefined
         assertParamExists('accountInfo', 'stakeAddr', stakeAddr);
         const localVarPath = `/accounts/{stake_addr}`.replace(
@@ -204,11 +204,11 @@ export const AccountsApiAxiosParamCreator = (configuration: Configuration) => ({
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    accountRewards: async (
+    accountRewards: (
         stakeAddr: string,
         localVarQueryParameter: AccountRewardsQueryParams = {},
         options: AxiosRequestConfig = {},
-    ): Promise<RequestArgs> => {
+    ): RequestArgs => {
         // verify required parameter 'stakeAddr' is not null or undefined
         assertParamExists('accountRewards', 'stakeAddr', stakeAddr);
         const localVarPath = `/accounts/{stake_addr}/rewards`.replace(
@@ -246,11 +246,11 @@ export const AccountsApiAxiosParamCreator = (configuration: Configuration) => ({
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    accountUpdates: async (
+    accountUpdates: (
         stakeAddr: string,
         localVarQueryParameter: AccountUpdatesQueryParams = {},
         options: AxiosRequestConfig = {},
-    ): Promise<RequestArgs> => {
+    ): RequestArgs => {
         // verify required parameter 'stakeAddr' is not null or undefined
         assertParamExists('accountUpdates', 'stakeAddr', stakeAddr);
         const localVarPath = `/accounts/{stake_addr}/updates`.replace(
@@ -297,12 +297,12 @@ export const AccountsApiFp = (configuration: Configuration) => {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async accountAddresses(
+        accountAddresses(
             stakeAddr: string,
             queryParams?: AccountAddressesQueryParams,
             options?: AxiosRequestConfig,
-        ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PaginatedAddress>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.accountAddresses(stakeAddr, queryParams, options);
+        ): () => Promise<PaginatedAddress> {
+            const localVarAxiosArgs = localVarAxiosParamCreator.accountAddresses(stakeAddr, queryParams, options);
             return createRequestFunction(localVarAxiosArgs, configuration);
         },
         /**
@@ -313,12 +313,12 @@ export const AccountsApiFp = (configuration: Configuration) => {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async accountAssets(
+        accountAssets(
             stakeAddr: string,
             queryParams?: AccountAssetsQueryParams,
             options?: AxiosRequestConfig,
-        ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PaginatedAsset>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.accountAssets(stakeAddr, queryParams, options);
+        ): () => Promise<PaginatedAsset> {
+            const localVarAxiosArgs = localVarAxiosParamCreator.accountAssets(stakeAddr, queryParams, options);
             return createRequestFunction(localVarAxiosArgs, configuration);
         },
         /**
@@ -329,12 +329,12 @@ export const AccountsApiFp = (configuration: Configuration) => {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async accountHistory(
+        accountHistory(
             stakeAddr: string,
             queryParams?: AccountHistoryQueryParams,
             options?: AxiosRequestConfig,
-        ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PaginatedAccountHistory>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.accountHistory(stakeAddr, queryParams, options);
+        ): () => Promise<PaginatedAccountHistory> {
+            const localVarAxiosArgs = localVarAxiosParamCreator.accountHistory(stakeAddr, queryParams, options);
             return createRequestFunction(localVarAxiosArgs, configuration);
         },
         /**
@@ -344,11 +344,8 @@ export const AccountsApiFp = (configuration: Configuration) => {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async accountInfo(
-            stakeAddr: string,
-            options?: AxiosRequestConfig,
-        ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<TimestampedAccountInfo>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.accountInfo(stakeAddr, options);
+        accountInfo(stakeAddr: string, options?: AxiosRequestConfig): () => Promise<TimestampedAccountInfo> {
+            const localVarAxiosArgs = localVarAxiosParamCreator.accountInfo(stakeAddr, options);
             return createRequestFunction(localVarAxiosArgs, configuration);
         },
         /**
@@ -359,12 +356,12 @@ export const AccountsApiFp = (configuration: Configuration) => {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async accountRewards(
+        accountRewards(
             stakeAddr: string,
             queryParams?: AccountRewardsQueryParams,
             options?: AxiosRequestConfig,
-        ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PaginatedAccountReward>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.accountRewards(stakeAddr, queryParams, options);
+        ): () => Promise<PaginatedAccountReward> {
+            const localVarAxiosArgs = localVarAxiosParamCreator.accountRewards(stakeAddr, queryParams, options);
             return createRequestFunction(localVarAxiosArgs, configuration);
         },
         /**
@@ -375,12 +372,12 @@ export const AccountsApiFp = (configuration: Configuration) => {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async accountUpdates(
+        accountUpdates(
             stakeAddr: string,
             queryParams?: AccountUpdatesQueryParams,
             options?: AxiosRequestConfig,
-        ): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PaginatedAccountUpdate>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.accountUpdates(stakeAddr, queryParams, options);
+        ): () => Promise<PaginatedAccountUpdate> {
+            const localVarAxiosArgs = localVarAxiosParamCreator.accountUpdates(stakeAddr, queryParams, options);
             return createRequestFunction(localVarAxiosArgs, configuration);
         },
     };

diff --git a/src/api/accounts/index.ts b/src/api/accounts/index.ts
@@ -30,9 +30,7 @@ export class AccountsApi extends BaseAPI {
         queryParams?: AccountAddressesQueryParams,
         options?: AxiosRequestConfig,
     ) {
-        return AccountsApiFp(this.configuration)
-            .accountAddresses(stakeAddr, queryParams, options)
-            .then((request) => request());
+        return AccountsApiFp(this.configuration).accountAddresses(stakeAddr, queryParams, options)();
     }
 
     /**
@@ -45,9 +43,7 @@ export class AccountsApi extends BaseAPI {
      * @memberof AccountsApi
      */
     public accountAssets(stakeAddr: string, queryParams?: AccountAssetsQueryParams, options?: AxiosRequestConfig) {
-        return AccountsApiFp(this.configuration)
-            .accountAssets(stakeAddr, queryParams, options)
-            .then((request) => request());
+        return AccountsApiFp(this.configuration).accountAssets(stakeAddr, queryParams, options)();
     }
 
     /**
@@ -60,9 +56,7 @@ export class AccountsApi extends BaseAPI {
      * @memberof AccountsApi
      */
     public accountHistory(stakeAddr: string, queryParams?: AccountHistoryQueryParams, options?: AxiosRequestConfig) {
-        return AccountsApiFp(this.configuration)
-            .accountHistory(stakeAddr, queryParams, options)
-            .then((request) => request());
+        return AccountsApiFp(this.configuration).accountHistory(stakeAddr, queryParams, options)();
     }
 
     /**
@@ -74,9 +68,7 @@ export class AccountsApi extends BaseAPI {
      * @memberof AccountsApi
      */
     public accountInfo(stakeAddr: string, options?: AxiosRequestConfig) {
-        return AccountsApiFp(this.configuration)
-            .accountInfo(stakeAddr, options)
-            .then((request) => request());
+        return AccountsApiFp(this.configuration).accountInfo(stakeAddr, options)();
     }
 
     /**
@@ -89,9 +81,7 @@ export class AccountsApi extends BaseAPI {
      * @memberof AccountsApi
      */
     public accountRewards(stakeAddr: string, queryParams?: AccountRewardsQueryParams, options?: AxiosRequestConfig) {
-        return AccountsApiFp(this.configuration)
-            .accountRewards(stakeAddr, queryParams, options)
-            .then((request) => request());
+        return AccountsApiFp(this.configuration).accountRewards(stakeAddr, queryParams, options)();
     }
 
     /**
@@ -104,9 +94,7 @@ export class AccountsApi extends BaseAPI {
      * @memberof AccountsApi
      */
     public accountUpdates(stakeAddr: string, queryParams?: AccountUpdatesQueryParams, options?: AxiosRequestConfig) {
-        return AccountsApiFp(this.configuration)
-            .accountUpdates(stakeAddr, queryParams, options)
-            .then((request) => request());
+        return AccountsApiFp(this.configuration).accountUpdates(stakeAddr, queryParams, options)();
     }
 }