From fca794e92e38b24446014812828b7d4adc0539ae Mon Sep 17 00:00:00 2001 From: willclarktech Date: Wed, 16 Jun 2021 10:22:21 +0200 Subject: [PATCH] Use string gas price in simple calculateFee cases --- packages/ledger-amino/src/ledgersigner.spec.ts | 3 +-- packages/stargate/src/testutils.spec.ts | 3 ++- scripts/wasmd/send_first.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ledger-amino/src/ledgersigner.spec.ts b/packages/ledger-amino/src/ledgersigner.spec.ts index de53234cee..05901abb26 100644 --- a/packages/ledger-amino/src/ledgersigner.spec.ts +++ b/packages/ledger-amino/src/ledgersigner.spec.ts @@ -16,7 +16,6 @@ import { import { assertIsBroadcastTxSuccess as assertIsBroadcastTxSuccessStargate, calculateFee, - GasPrice, SigningStargateClient, } from "@cosmjs/stargate"; import { sleep } from "@cosmjs/utils"; @@ -54,7 +53,7 @@ async function createTransport(): Promise { describe("LedgerSigner", () => { const defaultChainId = "testing"; - const defaultFee = calculateFee(80_000, GasPrice.fromString("0.025ucosm")); + const defaultFee = calculateFee(80_000, "0.025ucosm"); const defaultMemo = "Some memo"; const defaultSequence = "0"; const defaultAccountNumber = "42"; diff --git a/packages/stargate/src/testutils.spec.ts b/packages/stargate/src/testutils.spec.ts index 89c2fbdb6f..3f0e17d1ff 100644 --- a/packages/stargate/src/testutils.spec.ts +++ b/packages/stargate/src/testutils.spec.ts @@ -48,7 +48,8 @@ export function fromOneElementArray(elements: ArrayLike): T { return elements[0]; } -export const defaultSendFee = calculateFee(80_000, GasPrice.fromString("0.025ucosm")); +export const defaultGasPrice = GasPrice.fromString("0.025ucosm"); +export const defaultSendFee = calculateFee(80_000, defaultGasPrice); export const simapp = { tendermintUrl: "localhost:26658", diff --git a/scripts/wasmd/send_first.js b/scripts/wasmd/send_first.js index f7630361cc..2383e22bfb 100755 --- a/scripts/wasmd/send_first.js +++ b/scripts/wasmd/send_first.js @@ -25,7 +25,7 @@ async function main() { const client = await SigningStargateClient.connectWithSigner(rpcUrl, wallet, { prefix: prefix }); const recipient = Bech32.encode(prefix, Random.getBytes(20)); const amount = coins(226644, "ucosm"); - const fee = calculateFee(80_000, GasPrice.fromString("0.025ucosm")); + const fee = calculateFee(80_000, "0.025ucosm"); const memo = "Ensure chain has my pubkey"; const sendResult = await client.sendTokens(faucet.address0, recipient, amount, fee, memo); assertIsBroadcastTxSuccess(sendResult);