Migrate pendingWithoutSimapp46 to pendingWithoutSimapp46OrHigher

This commit is contained in:
Simon Warta 2023-04-06 17:24:23 +02:00
parent 4348cee45f
commit 6cb1a74b89
3 changed files with 8 additions and 8 deletions

View File

@ -12,7 +12,7 @@ import {
faucet,
makeRandomAddress,
pendingWithoutSimapp,
pendingWithoutSimapp46,
pendingWithoutSimapp46OrHigher,
simapp,
simapp44Enabled,
simapp46Enabled,
@ -105,7 +105,7 @@ describe("AuthzExtension", () => {
describe("granter grants", () => {
it("works", async () => {
pendingWithoutSimapp46();
pendingWithoutSimapp46OrHigher();
const [client, tmClient] = await makeClientWithAuthz(simapp.tendermintUrl);
const response = await client.authz.granterGrants(granter1Address);
expect(response.grants.length).toEqual(1);
@ -133,7 +133,7 @@ describe("AuthzExtension", () => {
describe("grantee grants", () => {
it("works", async () => {
pendingWithoutSimapp46();
pendingWithoutSimapp46OrHigher();
const [client, tmClient] = await makeClientWithAuthz(simapp.tendermintUrl);
const response = await client.authz.granteeGrants(grantee1Address);
expect(response.grants.length).toEqual(1);

View File

@ -10,7 +10,7 @@ import {
faucet,
makeRandomAddress,
pendingWithoutSimapp,
pendingWithoutSimapp46,
pendingWithoutSimapp46OrHigher,
simapp,
} from "../../testutils.spec";
@ -47,7 +47,7 @@ describe("vesting messages", () => {
});
it("works with Amino JSON sign mode", async () => {
pendingWithoutSimapp46(); // Amino JSON broken on chain before Cosmos SDK 0.46
pendingWithoutSimapp46OrHigher(); // Amino JSON broken on chain before Cosmos SDK 0.46
const wallet = await Secp256k1HdWallet.fromMnemonic(faucet.mnemonic);
const client = await SigningStargateClient.connectWithSigner(
simapp.tendermintUrl,

View File

@ -31,9 +31,9 @@ export function simappEnabled(): boolean {
return simapp44Enabled() || simapp46Enabled() || simapp47Enabled();
}
export function pendingWithoutSimapp46(): void {
if (!simapp46Enabled()) {
return pending("Set SIMAPP46_ENABLED to enable Simapp based tests");
export function pendingWithoutSimapp46OrHigher(): void {
if (!simapp46Enabled() && !simapp47Enabled()) {
return pending("Set SIMAPP46_ENABLED or SIMAPP47_ENABLED to enable Simapp based tests");
}
}