Skip to content

Commit 636b61e

Browse files
Merge pull request #563 from casper-ecosystem/CSDK/declaration-hotfix
Fix issue with declaration circular dependencies
2 parents 72d8d86 + 6f2b91c commit 636b61e

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

src/rpc/response.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@ export class StateGetBalanceResult {
101101
balanceValue: CLValueUInt512;
102102

103103
public rawJSON: any;
104+
105+
public toQueryBalanceResult() {
106+
const queryBalanceResult = new QueryBalanceResult();
107+
108+
queryBalanceResult.apiVersion = this.apiVersion;
109+
queryBalanceResult.balance = this.balanceValue;
110+
111+
return queryBalanceResult;
112+
}
104113
}
105114

106115
@jsonObject
@@ -279,7 +288,7 @@ export class InfoGetDeployResult {
279288
this.executionInfo.executionResult
280289
);
281290
} else if (this?.executionResultsV1?.length) {
282-
executionInfo = ExecutionInfo.fromV1(this.executionResultsV1)
291+
executionInfo = ExecutionInfo.fromV1(this.executionResultsV1);
283292
}
284293

285294
return new InfoGetTransactionResult(

src/utils/casper-network.ts

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
PurseIdentifier,
66
PutDeployResult,
77
PutTransactionResult,
8-
QueryBalanceResult,
98
RpcClient
109
} from '../rpc';
1110
import {
@@ -354,26 +353,17 @@ export class CasperNetwork {
354353
return getDeployResult.toInfoGetTransactionResult();
355354
}
356355

357-
public async queryLatestBalance(
358-
identifier: PurseIdentifier
359-
): Promise<QueryBalanceResult> {
356+
public async queryLatestBalance(identifier: PurseIdentifier) {
360357
if (this.apiVersion === 2) {
361358
return this.rpcClient.queryLatestBalance(identifier);
362359
}
363360

364-
const balanceResult = new QueryBalanceResult();
361+
const purseUref = identifier?.purseUref;
362+
if (!purseUref) return;
365363

366-
if (identifier?.purseUref) {
367-
const stateBalanceResult = await this.rpcClient.getLatestBalance(
368-
identifier.purseUref.toPrefixedString()
369-
);
370-
371-
if (stateBalanceResult) {
372-
balanceResult.balance = stateBalanceResult.balanceValue;
373-
balanceResult.apiVersion = stateBalanceResult.apiVersion;
374-
}
375-
}
376-
377-
return balanceResult;
364+
const balance = await this.rpcClient.getLatestBalance(
365+
purseUref.toPrefixedString()
366+
);
367+
return balance?.toQueryBalanceResult();
378368
}
379369
}

0 commit comments

Comments
 (0)