diff --git a/packages/launchpad/src/lcdapi/distribution.spec.ts b/packages/launchpad/src/lcdapi/distribution.spec.ts index 66e7cd9b..1f6165dd 100644 --- a/packages/launchpad/src/lcdapi/distribution.spec.ts +++ b/packages/launchpad/src/lcdapi/distribution.spec.ts @@ -13,7 +13,6 @@ import { faucet, nonNegativeIntegerMatcher, pendingWithoutWasmd, - validatorAddress, wasmd, wasmdEnabled, } from "../testutils.spec"; @@ -40,7 +39,7 @@ describe("DistributionExtension", () => { type: "cosmos-sdk/MsgDelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(25000, "ustake"), }, }; @@ -72,7 +71,7 @@ describe("DistributionExtension", () => { result: { rewards: [ { - validator_address: validatorAddress, + validator_address: wasmd.validator.address, reward: null, }, ], @@ -86,7 +85,7 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.delegatorReward(faucet.address, validatorAddress); + const response = await client.distribution.delegatorReward(faucet.address, wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [], @@ -110,12 +109,12 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.validator(validatorAddress); + const response = await client.distribution.validator(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { // TODO: This smells like a bug in the backend to me - operator_address: Bech32.encode("cosmos", Bech32.decode(validatorAddress).data), + operator_address: Bech32.encode("cosmos", Bech32.decode(wasmd.validator.address).data), self_bond_rewards: [ { denom: "ucosm", amount: jasmine.stringMatching(bigDecimalMatcher) }, { denom: "ustake", amount: jasmine.stringMatching(bigDecimalMatcher) }, @@ -133,7 +132,7 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.validatorRewards(validatorAddress); + const response = await client.distribution.validatorRewards(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ @@ -148,7 +147,7 @@ describe("DistributionExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeDistributionClient(wasmd.endpoint); - const response = await client.distribution.validatorOutstandingRewards(validatorAddress); + const response = await client.distribution.validatorOutstandingRewards(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ diff --git a/packages/launchpad/src/lcdapi/slashing.spec.ts b/packages/launchpad/src/lcdapi/slashing.spec.ts index 48f343d7..574d038c 100644 --- a/packages/launchpad/src/lcdapi/slashing.spec.ts +++ b/packages/launchpad/src/lcdapi/slashing.spec.ts @@ -17,7 +17,7 @@ describe("SlashingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - address: "cosmosvalcons14dsaw6zrrk3zugfgwwhmwap8p5cxsemfesgcaw", + address: "cosmosvalcons1zxds6samewvdpgt8cwpjtk3e8rdf26xu63dlqd", start_height: "0", index_offset: jasmine.stringMatching(nonNegativeIntegerMatcher), jailed_until: "1970-01-01T00:00:00Z", diff --git a/packages/launchpad/src/lcdapi/staking.spec.ts b/packages/launchpad/src/lcdapi/staking.spec.ts index 5127f65e..db75603c 100644 --- a/packages/launchpad/src/lcdapi/staking.spec.ts +++ b/packages/launchpad/src/lcdapi/staking.spec.ts @@ -10,11 +10,9 @@ import { SigningCosmosClient } from "../signingcosmosclient"; import { bigDecimalMatcher, dateTimeStampMatcher, - delegatorAddress, faucet, nonNegativeIntegerMatcher, pendingWithoutWasmd, - validatorAddress, wasmd, wasmdEnabled, } from "../testutils.spec"; @@ -42,7 +40,7 @@ describe("StakingExtension", () => { type: "cosmos-sdk/MsgDelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(25000, "ustake"), }, }; @@ -65,7 +63,7 @@ describe("StakingExtension", () => { type: "cosmos-sdk/MsgUndelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(100, "ustake"), }, }; @@ -98,7 +96,7 @@ describe("StakingExtension", () => { result: [ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, shares: jasmine.stringMatching(bigDecimalMatcher), balance: { denom: "ustake", amount: jasmine.stringMatching(nonNegativeIntegerMatcher) }, }, @@ -117,7 +115,7 @@ describe("StakingExtension", () => { expect(result).toEqual([ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, entries: jasmine.arrayContaining([ { creation_height: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -149,8 +147,8 @@ describe("StakingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -183,12 +181,12 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.delegatorValidator(faucet.address, validatorAddress); + const response = await client.staking.delegatorValidator(faucet.address, wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -220,12 +218,12 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.delegation(faucet.address, validatorAddress); + const response = await client.staking.delegation(faucet.address, wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, shares: jasmine.stringMatching(bigDecimalMatcher), balance: { denom: "ustake", amount: jasmine.stringMatching(nonNegativeIntegerMatcher) }, }, @@ -237,12 +235,15 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const { height, result } = await client.staking.unbondingDelegation(faucet.address, validatorAddress); + const { height, result } = await client.staking.unbondingDelegation( + faucet.address, + wasmd.validator.address, + ); expect(height).toMatch(nonNegativeIntegerMatcher); assert(result); expect(result).toEqual({ delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, entries: jasmine.arrayContaining([ { creation_height: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -277,8 +278,8 @@ describe("StakingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -324,8 +325,8 @@ describe("StakingExtension", () => { height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: [ { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -358,12 +359,12 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.validator(validatorAddress); + const response = await client.staking.validator(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: { - operator_address: validatorAddress, - consensus_pubkey: wasmd.consensusPubkey, + operator_address: wasmd.validator.address, + consensus_pubkey: wasmd.validator.pubkey, jailed: false, status: BondStatus.Bonded, tokens: jasmine.stringMatching(nonNegativeIntegerMatcher), @@ -395,19 +396,19 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const response = await client.staking.validatorDelegations(validatorAddress); + const response = await client.staking.validatorDelegations(wasmd.validator.address); expect(response).toEqual({ height: jasmine.stringMatching(nonNegativeIntegerMatcher), result: jasmine.arrayContaining([ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, shares: jasmine.stringMatching(bigDecimalMatcher), balance: { denom: "ustake", amount: jasmine.stringMatching(nonNegativeIntegerMatcher) }, }, { - delegator_address: delegatorAddress, - validator_address: validatorAddress, + delegator_address: wasmd.validator.delegatorAddress, + validator_address: wasmd.validator.address, shares: "250000000.000000000000000000", balance: { denom: "ustake", amount: "250000000" }, }, @@ -420,13 +421,13 @@ describe("StakingExtension", () => { it("works", async () => { pendingWithoutWasmd(); const client = makeStakingClient(wasmd.endpoint); - const { height, result } = await client.staking.validatorUnbondingDelegations(validatorAddress); + const { height, result } = await client.staking.validatorUnbondingDelegations(wasmd.validator.address); expect(height).toMatch(nonNegativeIntegerMatcher); assert(result); expect(result).toEqual([ { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, entries: jasmine.arrayContaining([ { creation_height: jasmine.stringMatching(nonNegativeIntegerMatcher), diff --git a/packages/launchpad/src/signingcosmosclient.spec.ts b/packages/launchpad/src/signingcosmosclient.spec.ts index 6ab1c5e9..a6b2d0b6 100644 --- a/packages/launchpad/src/signingcosmosclient.spec.ts +++ b/packages/launchpad/src/signingcosmosclient.spec.ts @@ -7,7 +7,7 @@ import { GasPrice } from "./gas"; import { MsgDelegate } from "./msgs"; import { Secp256k1Wallet } from "./secp256k1wallet"; import { PrivateSigningCosmosClient, SigningCosmosClient } from "./signingcosmosclient"; -import { makeRandomAddress, pendingWithoutWasmd, validatorAddress } from "./testutils.spec"; +import { makeRandomAddress, pendingWithoutWasmd, wasmd } from "./testutils.spec"; const httpUrl = "http://localhost:1317"; @@ -160,7 +160,7 @@ describe("SigningCosmosClient", () => { type: "cosmos-sdk/MsgDelegate", value: { delegator_address: faucet.address, - validator_address: validatorAddress, + validator_address: wasmd.validator.address, amount: coin(1234, "ustake"), }, }; diff --git a/packages/launchpad/src/testutils.spec.ts b/packages/launchpad/src/testutils.spec.ts index bb72d809..2093b56e 100644 --- a/packages/launchpad/src/testutils.spec.ts +++ b/packages/launchpad/src/testutils.spec.ts @@ -30,8 +30,12 @@ export const wasmd = { endpoint: "http://localhost:1317", chainId: "testing", moniker: "node001", - commissionUpdateTime: "2020-07-30T07:56:51.316162Z", - consensusPubkey: "cosmosvalconspub1zcjduepquk9s489p8l40yvq9er07tfjzkpm4ku4wphhz6567793dsjmdec4suucg87", + commissionUpdateTime: "2020-09-23T15:11:14.6660427Z", + validator: { + pubkey: "cosmosvalconspub1zcjduepq2dayuk3xq8rxqq6lyw6aqp2jaywdr8d855g09jf9h527zqwhqxgq7vf6kf", + address: "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz", + delegatorAddress: "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403", + }, }; export const faucet = { @@ -44,9 +48,6 @@ export const faucet = { address: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", }; -export const validatorAddress = "cosmosvaloper103c7vm0c5mz85ecdy4ldftk4a3ydcyp2sscqrz"; -export const delegatorAddress = "cosmos103c7vm0c5mz85ecdy4ldftk4a3ydcyp24yv403"; - /** Unused account */ export const unused = { pubkey: {