From fc9afd28c115eb241af07e963f583018b52b9338 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Thu, 3 Jun 2021 13:27:30 +0200 Subject: [PATCH] cosmwasm-stargate: Use cosmjs-types --- .../cosmwasm-stargate/src/aminotypes.spec.ts | 16 ++++++++-------- packages/cosmwasm-stargate/src/aminotypes.ts | 5 ++--- .../src/cosmwasmclient.searchtx.spec.ts | 2 +- .../src/cosmwasmclient.spec.ts | 2 +- .../cosmwasm-stargate/src/cosmwasmclient.ts | 4 ++-- .../cosmwasm-stargate/src/encodeobjects.ts | 3 +-- .../cosmwasm-stargate/src/queries/wasm.spec.ts | 8 ++++++-- packages/cosmwasm-stargate/src/queries/wasm.ts | 5 ++--- .../src/signingcosmwasmclient.spec.ts | 10 +++++----- .../src/signingcosmwasmclient.ts | 18 +++++++++--------- .../cosmwasm-stargate/src/testutils.spec.ts | 4 ++-- 11 files changed, 39 insertions(+), 38 deletions(-) diff --git a/packages/cosmwasm-stargate/src/aminotypes.spec.ts b/packages/cosmwasm-stargate/src/aminotypes.spec.ts index 8f26d8bb..34b96c05 100644 --- a/packages/cosmwasm-stargate/src/aminotypes.spec.ts +++ b/packages/cosmwasm-stargate/src/aminotypes.spec.ts @@ -1,6 +1,14 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { fromBase64, toUtf8 } from "@cosmjs/encoding"; import { AminoTypes, coins } from "@cosmjs/stargate"; +import { + MsgClearAdmin, + MsgExecuteContract, + MsgInstantiateContract, + MsgMigrateContract, + MsgStoreCode, + MsgUpdateAdmin, +} from "cosmjs-types/cosmwasm/wasm/v1beta1/tx"; import Long from "long"; import { @@ -12,14 +20,6 @@ import { AminoMsgUpdateAdmin, cosmWasmTypes, } from "./aminotypes"; -import { - MsgClearAdmin, - MsgExecuteContract, - MsgInstantiateContract, - MsgMigrateContract, - MsgStoreCode, - MsgUpdateAdmin, -} from "./codec/cosmwasm/wasm/v1beta1/tx"; describe("AminoTypes", () => { describe("toAmino", () => { diff --git a/packages/cosmwasm-stargate/src/aminotypes.ts b/packages/cosmwasm-stargate/src/aminotypes.ts index 01cb2383..1538ec32 100644 --- a/packages/cosmwasm-stargate/src/aminotypes.ts +++ b/packages/cosmwasm-stargate/src/aminotypes.ts @@ -1,8 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { fromBase64, fromUtf8, toBase64, toUtf8 } from "@cosmjs/encoding"; import { AminoConverter, Coin } from "@cosmjs/stargate"; -import Long from "long"; - import { MsgClearAdmin, MsgExecuteContract, @@ -10,7 +8,8 @@ import { MsgMigrateContract, MsgStoreCode, MsgUpdateAdmin, -} from "./codec/cosmwasm/wasm/v1beta1/tx"; +} from "cosmjs-types/cosmwasm/wasm/v1beta1/tx"; +import Long from "long"; // TODO: implement /** diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts index ddb92d82..065013fc 100644 --- a/packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts +++ b/packages/cosmwasm-stargate/src/cosmwasmclient.searchtx.spec.ts @@ -17,8 +17,8 @@ import { isBroadcastTxSuccess, isMsgSendEncodeObject, } from "@cosmjs/stargate"; -import { TxRaw } from "@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx"; import { assert, sleep } from "@cosmjs/utils"; +import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx"; import { CosmWasmClient } from "./cosmwasmclient"; import { diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts index 46dd0b20..7b0502e8 100644 --- a/packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts +++ b/packages/cosmwasm-stargate/src/cosmwasmclient.spec.ts @@ -12,8 +12,8 @@ import { TxBodyEncodeObject, } from "@cosmjs/proto-signing"; import { assertIsBroadcastTxSuccess, coins, logs, MsgSendEncodeObject, StdFee } from "@cosmjs/stargate"; -import { TxRaw } from "@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx"; import { assert, sleep } from "@cosmjs/utils"; +import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx"; import { ReadonlyDate } from "readonly-date"; import { CosmWasmClient, PrivateCosmWasmClient } from "./cosmwasmclient"; diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts index fbb9c014..147ead52 100644 --- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts @@ -30,9 +30,9 @@ import { } from "@cosmjs/stargate"; import { Tendermint34Client, toRfc3339WithNanoseconds } from "@cosmjs/tendermint-rpc"; import { assert, sleep } from "@cosmjs/utils"; +import { CodeInfoResponse } from "cosmjs-types/cosmwasm/wasm/v1beta1/query"; +import { ContractCodeHistoryOperationType } from "cosmjs-types/cosmwasm/wasm/v1beta1/types"; -import { CodeInfoResponse } from "./codec/cosmwasm/wasm/v1beta1/query"; -import { ContractCodeHistoryOperationType } from "./codec/cosmwasm/wasm/v1beta1/types"; import { setupWasmExtension, WasmExtension } from "./queries"; // Those types can be copied over to allow them to evolve independently of @cosmjs/cosmwasm-launchpad. diff --git a/packages/cosmwasm-stargate/src/encodeobjects.ts b/packages/cosmwasm-stargate/src/encodeobjects.ts index 3584c693..b20787cd 100644 --- a/packages/cosmwasm-stargate/src/encodeobjects.ts +++ b/packages/cosmwasm-stargate/src/encodeobjects.ts @@ -1,5 +1,4 @@ import { EncodeObject } from "@cosmjs/proto-signing"; - import { MsgClearAdmin, MsgExecuteContract, @@ -7,7 +6,7 @@ import { MsgMigrateContract, MsgStoreCode, MsgUpdateAdmin, -} from "./codec/cosmwasm/wasm/v1beta1/tx"; +} from "cosmjs-types/cosmwasm/wasm/v1beta1/tx"; export interface MsgStoreCodeEncodeObject extends EncodeObject { readonly typeUrl: "/cosmwasm.wasm.v1beta1.MsgStoreCode"; diff --git a/packages/cosmwasm-stargate/src/queries/wasm.spec.ts b/packages/cosmwasm-stargate/src/queries/wasm.spec.ts index 4f825d44..4a541084 100644 --- a/packages/cosmwasm-stargate/src/queries/wasm.spec.ts +++ b/packages/cosmwasm-stargate/src/queries/wasm.spec.ts @@ -13,10 +13,14 @@ import { StdFee, } from "@cosmjs/stargate"; import { assert } from "@cosmjs/utils"; +import { + MsgExecuteContract, + MsgInstantiateContract, + MsgStoreCode, +} from "cosmjs-types/cosmwasm/wasm/v1beta1/tx"; +import { ContractCodeHistoryOperationType } from "cosmjs-types/cosmwasm/wasm/v1beta1/types"; import Long from "long"; -import { MsgExecuteContract, MsgInstantiateContract, MsgStoreCode } from "../codec/cosmwasm/wasm/v1beta1/tx"; -import { ContractCodeHistoryOperationType } from "../codec/cosmwasm/wasm/v1beta1/types"; import { MsgExecuteContractEncodeObject, MsgInstantiateContractEncodeObject, diff --git a/packages/cosmwasm-stargate/src/queries/wasm.ts b/packages/cosmwasm-stargate/src/queries/wasm.ts index 163ed413..579ab1d0 100644 --- a/packages/cosmwasm-stargate/src/queries/wasm.ts +++ b/packages/cosmwasm-stargate/src/queries/wasm.ts @@ -2,8 +2,6 @@ import { JsonObject } from "@cosmjs/cosmwasm-launchpad"; import { fromUtf8, toAscii } from "@cosmjs/encoding"; import { createPagination, createProtobufRpcClient, QueryClient } from "@cosmjs/stargate"; -import Long from "long"; - import { QueryAllContractStateResponse, QueryClientImpl, @@ -13,7 +11,8 @@ import { QueryContractInfoResponse, QueryContractsByCodeResponse, QueryRawContractStateResponse, -} from "../codec/cosmwasm/wasm/v1beta1/query"; +} from "cosmjs-types/cosmwasm/wasm/v1beta1/query"; +import Long from "long"; export interface WasmExtension { readonly wasm: { diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts index fe254e1e..ec3dd984 100644 --- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts +++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.spec.ts @@ -14,16 +14,16 @@ import { MsgDelegateEncodeObject, MsgSendEncodeObject, } from "@cosmjs/stargate"; -import { DeepPartial, MsgSend } from "@cosmjs/stargate/build/codec/cosmos/bank/v1beta1/tx"; -import { Coin } from "@cosmjs/stargate/build/codec/cosmos/base/v1beta1/coin"; -import { MsgDelegate } from "@cosmjs/stargate/build/codec/cosmos/staking/v1beta1/tx"; -import { AuthInfo, TxBody, TxRaw } from "@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx"; import { assert, sleep } from "@cosmjs/utils"; +import { DeepPartial, MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx"; +import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin"; +import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx"; +import { AuthInfo, TxBody, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx"; +import { MsgStoreCode } from "cosmjs-types/cosmwasm/wasm/v1beta1/tx"; import Long from "long"; import pako from "pako"; import protobuf from "protobufjs/minimal"; -import { MsgStoreCode } from "./codec/cosmwasm/wasm/v1beta1/tx"; import { MsgStoreCodeEncodeObject } from "./encodeobjects"; import { SigningCosmWasmClient } from "./signingcosmwasmclient"; import { diff --git a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts index b1894aeb..4cb1cfa5 100644 --- a/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts +++ b/packages/cosmwasm-stargate/src/signingcosmwasmclient.ts @@ -44,16 +44,12 @@ import { SignerData, StdFee, } from "@cosmjs/stargate"; -import { MsgWithdrawDelegatorReward } from "@cosmjs/stargate/build/codec/cosmos/distribution/v1beta1/tx"; -import { MsgDelegate, MsgUndelegate } from "@cosmjs/stargate/build/codec/cosmos/staking/v1beta1/tx"; -import { SignMode } from "@cosmjs/stargate/build/codec/cosmos/tx/signing/v1beta1/signing"; -import { TxRaw } from "@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx"; import { Tendermint34Client } from "@cosmjs/tendermint-rpc"; import { assert } from "@cosmjs/utils"; -import Long from "long"; -import pako from "pako"; - -import { cosmWasmTypes } from "./aminotypes"; +import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx"; +import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx"; +import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing"; +import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx"; import { MsgClearAdmin, MsgExecuteContract, @@ -61,7 +57,11 @@ import { MsgMigrateContract, MsgStoreCode, MsgUpdateAdmin, -} from "./codec/cosmwasm/wasm/v1beta1/tx"; +} from "cosmjs-types/cosmwasm/wasm/v1beta1/tx"; +import Long from "long"; +import pako from "pako"; + +import { cosmWasmTypes } from "./aminotypes"; import { CosmWasmClient } from "./cosmwasmclient"; import { MsgClearAdminEncodeObject, diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts index 8afc8ca1..7f80d47d 100644 --- a/packages/cosmwasm-stargate/src/testutils.spec.ts +++ b/packages/cosmwasm-stargate/src/testutils.spec.ts @@ -16,9 +16,9 @@ import { setupAuthExtension, setupBankExtension, } from "@cosmjs/stargate"; -import { SignMode } from "@cosmjs/stargate/build/codec/cosmos/tx/signing/v1beta1/signing"; -import { AuthInfo, SignDoc, TxBody } from "@cosmjs/stargate/build/codec/cosmos/tx/v1beta1/tx"; import { Tendermint34Client } from "@cosmjs/tendermint-rpc"; +import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing"; +import { AuthInfo, SignDoc, TxBody } from "cosmjs-types/cosmos/tx/v1beta1/tx"; import { setupWasmExtension, WasmExtension } from "./queries"; import hackatom from "./testdata/contract.json";