From 29b0bc423572b526fecd1c504d41bef44ce81106 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Wed, 5 Mar 2025 13:43:16 -0800 Subject: [PATCH] lint: eslint to green --- dapps/fast-usdc/api/package.json | 1 + .../api/test/operator-commands.test.ts | 4 ++-- dapps/fast-usdc/api/test/transfer.test.ts | 10 ++++----- dapps/fast-usdc/tsconfig.json | 1 + dapps/fast-usdc/vm-integration/package.json | 1 + .../scripts/fast-usdc-fees.build.js | 4 ++-- .../scripts/fast-usdc-reconfigure.build.js | 2 +- .../vm-integration/test/fast-usdc.test.ts | 6 +++-- .../test/utils/chain-policies.test.ts | 3 ++- .../vm-integration/test/walletFactory.ts | 22 +++++++++---------- dapps/fast-usdc/worker/package.json | 1 + .../worker/test/exos/advancer.test.ts | 10 ++++----- .../worker/test/exos/settler.test.ts | 12 +++++----- .../worker/test/exos/status-manager.test.ts | 2 +- .../worker/test/exos/transaction-feed.test.ts | 4 ++-- dapps/fast-usdc/worker/test/supports.ts | 2 +- .../fast-usdc/worker/test/type-guards.test.ts | 7 +++--- .../fast-usdc/worker/test/utils/fees.test.ts | 8 +++---- dapps/fast-usdc/yarn.lock | 10 +++++++-- 19 files changed, 61 insertions(+), 49 deletions(-) diff --git a/dapps/fast-usdc/api/package.json b/dapps/fast-usdc/api/package.json index c36f41acee4..b5d4834f76c 100644 --- a/dapps/fast-usdc/api/package.json +++ b/dapps/fast-usdc/api/package.json @@ -39,6 +39,7 @@ "@agoric/client-utils": "dev", "@agoric/cosmic-proto": "dev", "@agoric/ertp": "dev", + "@agoric/fast-usdc": "workspace:*", "@agoric/fast-usdc-worker": "workspace:*", "@agoric/internal": "dev", "@agoric/notifier": "dev", diff --git a/dapps/fast-usdc/api/test/operator-commands.test.ts b/dapps/fast-usdc/api/test/operator-commands.test.ts index 6e777555d09..91f1380d785 100644 --- a/dapps/fast-usdc/api/test/operator-commands.test.ts +++ b/dapps/fast-usdc/api/test/operator-commands.test.ts @@ -1,10 +1,10 @@ +import { addOperatorCommands } from '@agoric/fast-usdc/src/cli/operator-commands.js'; +import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; import { makeMarshal } from '@endo/marshal'; import test from 'ava'; import { Command } from 'commander'; -import { addOperatorCommands } from '@agoric/fast-usdc/src/cli/operator-commands.js'; import { flags } from '../../tools/cli-tools.js'; import { mockStream } from '../../tools/mock-io.js'; -import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; const marshalData = makeMarshal(_v => assert.fail('data only')); diff --git a/dapps/fast-usdc/api/test/transfer.test.ts b/dapps/fast-usdc/api/test/transfer.test.ts index f5e31a1ddf5..a5264d4391e 100644 --- a/dapps/fast-usdc/api/test/transfer.test.ts +++ b/dapps/fast-usdc/api/test/transfer.test.ts @@ -1,14 +1,14 @@ -import test from 'ava'; import { encodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js'; import transfer from '@agoric/fast-usdc/src/cli/transfer.js'; +import { settlementAddress } from '@agoric/fast-usdc/src/fixtures.js'; +import test from 'ava'; import { - mockOut, - mockFile, - makeVstorageMock, makeFetchMock, makeMockSigner, + makeVstorageMock, + mockFile, + mockOut, } from '../../testing/mocks.js'; -import { settlementAddress } from '@agoric/fast-usdc/src/fixtures.js'; test('Errors if config missing', async t => { const path = 'config/dir/.fast-usdc/config.json'; diff --git a/dapps/fast-usdc/tsconfig.json b/dapps/fast-usdc/tsconfig.json index 298a9766237..c3bf1c48f7a 100644 --- a/dapps/fast-usdc/tsconfig.json +++ b/dapps/fast-usdc/tsconfig.json @@ -28,6 +28,7 @@ "build", ], "include": [ + "*/scripts", "*/src", "*/test", ], diff --git a/dapps/fast-usdc/vm-integration/package.json b/dapps/fast-usdc/vm-integration/package.json index 8f0eb26fbe9..7920b6205ee 100644 --- a/dapps/fast-usdc/vm-integration/package.json +++ b/dapps/fast-usdc/vm-integration/package.json @@ -29,6 +29,7 @@ "@agoric/orchestration": "dev", "@agoric/store": "dev", "@agoric/vat-data": "dev", + "@agoric/vats": "dev", "@agoric/vow": "dev", "@agoric/zoe": "dev", "@cosmjs/proto-signing": "^0.32.4", diff --git a/dapps/fast-usdc/vm-integration/scripts/fast-usdc-fees.build.js b/dapps/fast-usdc/vm-integration/scripts/fast-usdc-fees.build.js index 8d3e36c06e2..d418ac01d91 100644 --- a/dapps/fast-usdc/vm-integration/scripts/fast-usdc-fees.build.js +++ b/dapps/fast-usdc/vm-integration/scripts/fast-usdc-fees.build.js @@ -1,13 +1,13 @@ import { makeHelpers } from '@agoric/deploy-script-support'; import { AmountMath } from '@agoric/ertp'; -import { getManifestForDistributeFees } from '../src/distribute-fees.core.js'; -import { toExternalConfig } from '../src/utils/config-marshal.js'; import { multiplyBy, parseRatio, } from '@agoric/zoe/src/contractSupport/ratio.js'; import { Far } from '@endo/far'; import { parseArgs } from 'node:util'; +import { getManifestForDistributeFees } from '../src/distribute-fees.core.js'; +import { toExternalConfig } from '../src/utils/config-marshal.js'; /** * @import {CoreEvalBuilder, DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js' diff --git a/dapps/fast-usdc/vm-integration/scripts/fast-usdc-reconfigure.build.js b/dapps/fast-usdc/vm-integration/scripts/fast-usdc-reconfigure.build.js index 943ca4baf89..40e1c6accc8 100644 --- a/dapps/fast-usdc/vm-integration/scripts/fast-usdc-reconfigure.build.js +++ b/dapps/fast-usdc/vm-integration/scripts/fast-usdc-reconfigure.build.js @@ -5,10 +5,10 @@ * channel info defaults to mainnet configuration (see update-noble-ica.core.js) */ import { makeHelpers } from '@agoric/deploy-script-support'; -import { getManifestForUpdateNobleICA } from '../src/update-noble-ica.core.js'; import { IBCConnectionInfoShape } from '@agoric/orchestration'; import { mustMatch } from '@endo/patterns'; import { parseArgs } from 'node:util'; +import { getManifestForUpdateNobleICA } from '../src/update-noble-ica.core.js'; /** * @import {CoreEvalBuilder, DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js' diff --git a/dapps/fast-usdc/vm-integration/test/fast-usdc.test.ts b/dapps/fast-usdc/vm-integration/test/fast-usdc.test.ts index e6e9254114a..46d94eeb9f0 100644 --- a/dapps/fast-usdc/vm-integration/test/fast-usdc.test.ts +++ b/dapps/fast-usdc/vm-integration/test/fast-usdc.test.ts @@ -11,10 +11,12 @@ import { encodeAddressHook } from '@agoric/cosmic-proto/address-hooks.js'; import { AmountMath } from '@agoric/ertp'; import { Offers } from '@agoric/fast-usdc/src/clientSupport.js'; import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; -import { documentStorageSchema } from '@agoric/governance/tools/storageDoc.js'; import { BridgeId, NonNullish } from '@agoric/internal'; import { unmarshalFromVstorage } from '@agoric/internal/src/marshal.js'; -import { defaultSerializer } from '@agoric/internal/src/storage-test-utils.js'; +import { + defaultSerializer, + documentStorageSchema, +} from '@agoric/internal/src/storage-test-utils.js'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; import { buildVTransferEvent } from '@agoric/orchestration/tools/ibc-mocks.js'; import { makeRatio } from '@agoric/zoe/src/contractSupport/ratio.js'; diff --git a/dapps/fast-usdc/vm-integration/test/utils/chain-policies.test.ts b/dapps/fast-usdc/vm-integration/test/utils/chain-policies.test.ts index 6f2bee4c1e1..3b46ad69d42 100644 --- a/dapps/fast-usdc/vm-integration/test/utils/chain-policies.test.ts +++ b/dapps/fast-usdc/vm-integration/test/utils/chain-policies.test.ts @@ -1,7 +1,8 @@ /** @file test that chain policies match data from a requirements-gathering spreadsheet */ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import { ChainPolicies } from '../../src/utils/chain-policies.js'; + import { type ChainPolicy } from '@agoric/fast-usdc-worker/src/types.js'; +import { ChainPolicies } from '../../src/utils/chain-policies.js'; /** Spreadsheet header becomes a tuple type with column names used as tags */ type PolicyRow = [ diff --git a/dapps/fast-usdc/vm-integration/test/walletFactory.ts b/dapps/fast-usdc/vm-integration/test/walletFactory.ts index 44bb9248c0e..cd63bd9c11e 100644 --- a/dapps/fast-usdc/vm-integration/test/walletFactory.ts +++ b/dapps/fast-usdc/vm-integration/test/walletFactory.ts @@ -12,18 +12,18 @@ import { makeWalletFactoryDriver } from '@agoric/boot/tools/drivers.js'; * This function sets up a complete SwingSet kernel with mocked bridges and * utilities for time manipulation, proposal evaluation, and more. * - * @param log - Logging function + * @param t - Ava test context * @param configSpecifier - Path to the base config file - * @param options - Configuration options - * @param options.label - Optional label for the test environment - * @param options.storage - Storage kit to use (defaults to fake storage) - * @param options.verbose - Whether to enable verbose logging - * @param options.slogFile - Path to write slog output - * @param options.profileVats - Array of vat names to profile - * @param options.debugVats - Array of vat names to debug - * @param options.defaultManagerType - SwingSet manager type to use - * @param options.harness - Optional run harness - * @param options.resolveBase - Base URL or path for resolving module paths + * @param opts - Configuration options + * @param opts.label - Optional label for the test environment + * @param opts.storage - Storage kit to use (defaults to fake storage) + * @param opts.verbose - Whether to enable verbose logging + * @param opts.slogFile - Path to write slog output + * @param opts.profileVats - Array of vat names to profile + * @param opts.debugVats - Array of vat names to debug + * @param opts.defaultManagerType - SwingSet manager type to use + * @param opts.harness - Optional run harness + * @param opts.resolveBase - Base URL or path for resolving module paths * @returns A test kit with various utilities for interacting with the SwingSet */ export const makeWalletFactoryContext = async ( diff --git a/dapps/fast-usdc/worker/package.json b/dapps/fast-usdc/worker/package.json index 73e46c23c6f..fcf42a3178c 100644 --- a/dapps/fast-usdc/worker/package.json +++ b/dapps/fast-usdc/worker/package.json @@ -20,6 +20,7 @@ "devDependencies": { "@agoric/deploy-script-support": "dev", "@agoric/eslint-config": "^0.4.1-dev-7efdf47.0", + "@agoric/network": "^0.1.0", "@agoric/swingset-liveslots": "dev", "@agoric/vats": "dev", "@agoric/zoe": "dev", diff --git a/dapps/fast-usdc/worker/test/exos/advancer.test.ts b/dapps/fast-usdc/worker/test/exos/advancer.test.ts index 53d68a12620..acb5a9db4d3 100644 --- a/dapps/fast-usdc/worker/test/exos/advancer.test.ts +++ b/dapps/fast-usdc/worker/test/exos/advancer.test.ts @@ -5,6 +5,11 @@ import { encodeAddressHook, } from '@agoric/cosmic-proto/address-hooks.js'; import type { NatAmount } from '@agoric/ertp'; +import { + intermediateRecipient, + MockCctpTxEvidences, + settlementAddress, +} from '@agoric/fast-usdc/src/fixtures.js'; import { makeTracer } from '@agoric/internal'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; import { CosmosChainAddressShape, denomHash } from '@agoric/orchestration'; @@ -25,11 +30,6 @@ import { prepareStatusManager } from '../../src/exos/status-manager.js'; import { CctpTxEvidenceShape } from '../../src/type-guards.js'; import type { LiquidityPoolKit } from '../../src/types.js'; import { makeFeeTools } from '../../src/utils/fees.js'; -import { - intermediateRecipient, - MockCctpTxEvidences, - settlementAddress, -} from '@agoric/fast-usdc/src/fixtures.js'; import { makeTestFeeConfig, makeTestLogger, diff --git a/dapps/fast-usdc/worker/test/exos/settler.test.ts b/dapps/fast-usdc/worker/test/exos/settler.test.ts index ecf80311111..7a167740afa 100644 --- a/dapps/fast-usdc/worker/test/exos/settler.test.ts +++ b/dapps/fast-usdc/worker/test/exos/settler.test.ts @@ -5,13 +5,18 @@ import { decodeAddressHook, encodeAddressHook, } from '@agoric/cosmic-proto/address-hooks.js'; +import { + MockCctpTxEvidences, + MockVTransferEvents, + intermediateRecipient, +} from '@agoric/fast-usdc/src/fixtures.js'; import { defaultMarshaller } from '@agoric/internal/src/storage-test-utils.js'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js'; import { buildVTransferEvent } from '@agoric/orchestration/tools/ibc-mocks.js'; +import type { ZcfSeatKit } from '@agoric/zoe'; import type { Zone } from '@agoric/zone'; import type { EReturn } from '@endo/far'; -import type { ZcfSeatKit } from '@agoric/zoe'; import { PendingTxStatus, TxStatus } from '../../src/constants.js'; import { prepareSettler, @@ -21,11 +26,6 @@ import { import { prepareStatusManager } from '../../src/exos/status-manager.js'; import type { CctpTxEvidence } from '../../src/types.js'; import { makeFeeTools } from '../../src/utils/fees.js'; -import { - MockCctpTxEvidences, - MockVTransferEvents, - intermediateRecipient, -} from '@agoric/fast-usdc/src/fixtures.js'; import { makeTestLogger, prepareMockOrchAccounts } from '../mocks.js'; import { commonSetup } from '../supports.js'; diff --git a/dapps/fast-usdc/worker/test/exos/status-manager.test.ts b/dapps/fast-usdc/worker/test/exos/status-manager.test.ts index 0801a0a87d2..9af61021cd3 100644 --- a/dapps/fast-usdc/worker/test/exos/status-manager.test.ts +++ b/dapps/fast-usdc/worker/test/exos/status-manager.test.ts @@ -1,6 +1,7 @@ import { test as anyTest } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import type { TestFn } from 'ava'; +import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; import { defaultMarshaller } from '@agoric/internal/src/storage-test-utils.js'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; import type { EReturn } from '@endo/far'; @@ -11,7 +12,6 @@ import { type StatusManager, } from '../../src/exos/status-manager.js'; import type { CctpTxEvidence } from '../../src/types.js'; -import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; import { commonSetup, provideDurableZone } from '../supports.js'; type Common = EReturn; diff --git a/dapps/fast-usdc/worker/test/exos/transaction-feed.test.ts b/dapps/fast-usdc/worker/test/exos/transaction-feed.test.ts index 1c02275f53e..d70ebb477ef 100644 --- a/dapps/fast-usdc/worker/test/exos/transaction-feed.test.ts +++ b/dapps/fast-usdc/worker/test/exos/transaction-feed.test.ts @@ -1,15 +1,15 @@ // Must be first to set up globals import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; +import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; import { deeplyFulfilledObject } from '@agoric/internal'; -import { makeHeapZone } from '@agoric/zone'; import { eventLoopIteration } from '@agoric/internal/src/testing-utils.js'; +import { makeHeapZone } from '@agoric/zone'; import { prepareTransactionFeedKit, stateShape, type TransactionFeedKit, } from '../../src/exos/transaction-feed.js'; -import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; const nullZcf = null as any; diff --git a/dapps/fast-usdc/worker/test/supports.ts b/dapps/fast-usdc/worker/test/supports.ts index 80ec14564e4..7d46789b4c3 100644 --- a/dapps/fast-usdc/worker/test/supports.ts +++ b/dapps/fast-usdc/worker/test/supports.ts @@ -18,7 +18,6 @@ import { } from '@agoric/orchestration/src/exos/chain-hub.js'; import { prepareCosmosInterchainService } from '@agoric/orchestration/src/exos/cosmos-interchain-service.js'; import fetchedChainInfo from '@agoric/orchestration/src/fetched-chain-info.js'; -import { setupFakeNetwork } from './network-fakes.js'; import { buildVTransferEvent } from '@agoric/orchestration/tools/ibc-mocks.js'; import { makeTestAddress } from '@agoric/orchestration/tools/make-test-address.js'; import { reincarnate } from '@agoric/swingset-liveslots/tools/setup-vat-data.js'; @@ -42,6 +41,7 @@ import { makeDurableZone } from '@agoric/zone/durable.js'; import { E } from '@endo/far'; import type { ExecutionContext } from 'ava'; import { makeTestFeeConfig } from './mocks.js'; +import { setupFakeNetwork } from './network-fakes.js'; export { makeFakeLocalchainBridge, diff --git a/dapps/fast-usdc/worker/test/type-guards.test.ts b/dapps/fast-usdc/worker/test/type-guards.test.ts index e8a57022be9..33fc8e5b943 100644 --- a/dapps/fast-usdc/worker/test/type-guards.test.ts +++ b/dapps/fast-usdc/worker/test/type-guards.test.ts @@ -1,7 +1,8 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import { M, mustMatch } from '@endo/patterns'; -import { TxStatus, PendingTxStatus } from '../src/constants.js'; +import { mustMatch } from '@endo/patterns'; +import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; +import { PendingTxStatus, TxStatus } from '../src/constants.js'; import { CctpTxEvidenceShape, ChainPolicyShape, @@ -9,8 +10,6 @@ import { } from '../src/type-guards.js'; import type { CctpTxEvidence, ChainPolicy } from '../src/types.js'; -import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; - test('CctpTxEvidenceShape', t => { const specimen: CctpTxEvidence = harden( MockCctpTxEvidences.AGORIC_PLUS_OSMO(), diff --git a/dapps/fast-usdc/worker/test/utils/fees.test.ts b/dapps/fast-usdc/worker/test/utils/fees.test.ts index 496113d8647..3a0145dd150 100644 --- a/dapps/fast-usdc/worker/test/utils/fees.test.ts +++ b/dapps/fast-usdc/worker/test/utils/fees.test.ts @@ -1,12 +1,12 @@ -import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; -import { makeIssuerKit, AmountMath, type Amount } from '@agoric/ertp'; +import { AmountMath, makeIssuerKit, type Amount } from '@agoric/ertp'; +import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/ratio.js'; +import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js'; import { withAmountUtils } from '@agoric/zoe/tools/test-utils.js'; import { q } from '@endo/errors'; -import { makeFeeTools } from '../../src/utils/fees.js'; import type { FeeConfig } from '../../src/types.js'; +import { makeFeeTools } from '../../src/utils/fees.js'; import { makeTestFeeConfig } from '../mocks.js'; -import { MockCctpTxEvidences } from '@agoric/fast-usdc/src/fixtures.js'; const { add, isEqual } = AmountMath; diff --git a/dapps/fast-usdc/yarn.lock b/dapps/fast-usdc/yarn.lock index 9f04c43bf31..2c5ac540a74 100644 --- a/dapps/fast-usdc/yarn.lock +++ b/dapps/fast-usdc/yarn.lock @@ -220,11 +220,15 @@ __metadata: "@agoric/cosmic-proto": "npm:dev" "@agoric/deploy-script-support": "npm:dev" "@agoric/ertp": "npm:dev" + "@agoric/fast-usdc": "workspace:*" + "@agoric/fast-usdc-vm": "workspace:*" + "@agoric/fast-usdc-worker": "workspace:*" "@agoric/internal": "npm:dev" "@agoric/notifier": "npm:dev" "@agoric/orchestration": "npm:dev" "@agoric/store": "npm:dev" "@agoric/vat-data": "npm:dev" + "@agoric/vats": "npm:dev" "@agoric/vow": "npm:dev" "@agoric/zoe": "npm:dev" "@cosmjs/proto-signing": "npm:^0.32.4" @@ -248,7 +252,7 @@ __metadata: languageName: unknown linkType: soft -"@agoric/fast-usdc-worker@workspace:worker": +"@agoric/fast-usdc-worker@workspace:*, @agoric/fast-usdc-worker@workspace:worker": version: 0.0.0-use.local resolution: "@agoric/fast-usdc-worker@workspace:worker" dependencies: @@ -298,7 +302,7 @@ __metadata: languageName: unknown linkType: soft -"@agoric/fast-usdc@workspace:api": +"@agoric/fast-usdc@workspace:*, @agoric/fast-usdc@workspace:api": version: 0.0.0-use.local resolution: "@agoric/fast-usdc@workspace:api" dependencies: @@ -307,6 +311,8 @@ __metadata: "@agoric/deploy-script-support": "npm:dev" "@agoric/ertp": "npm:dev" "@agoric/eslint-config": "npm:^0.4.1-dev-7efdf47.0" + "@agoric/fast-usdc": "workspace:*" + "@agoric/fast-usdc-worker": "workspace:*" "@agoric/internal": "npm:dev" "@agoric/notifier": "npm:dev" "@agoric/orchestration": "npm:dev"