Skip to content
This repository was archived by the owner on Dec 13, 2019. It is now read-only.

Commit 99fc555

Browse files
snarioldct
snario
authored and
ldct
committed
[node] Moves files from machine subfolder to higher order folder (#1333)
* Moves files from machine subfolder to higher order folder * Add export
1 parent e0b8a84 commit 99fc555

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+122
-120
lines changed

‎packages/node/src/machine/ethereum/eth-virtual-app-agreement-commitment.ts renamed to ‎packages/node/src/ethereum/eth-virtual-app-agreement-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/index.ts renamed to ‎packages/node/src/ethereum/index.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/install-commitment.ts renamed to ‎packages/node/src/ethereum/install-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/multisend-commitment.ts renamed to ‎packages/node/src/ethereum/multisend-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/multisig-commitment.ts renamed to ‎packages/node/src/ethereum/multisig-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/set-state-commitment.ts renamed to ‎packages/node/src/ethereum/set-state-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/setup-commitment.ts renamed to ‎packages/node/src/ethereum/setup-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/types.ts renamed to ‎packages/node/src/ethereum/types.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/uninstall-commitment.ts renamed to ‎packages/node/src/ethereum/uninstall-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/utils/app-identity.ts renamed to ‎packages/node/src/ethereum/utils/app-identity.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/utils/encodings.ts renamed to ‎packages/node/src/ethereum/utils/encodings.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/utils/eth-bucket.ts renamed to ‎packages/node/src/ethereum/utils/eth-bucket.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/utils/index.ts renamed to ‎packages/node/src/ethereum/utils/index.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/utils/multisend-decoder.ts renamed to ‎packages/node/src/ethereum/utils/multisend-decoder.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/utils/multisend-encoder.ts renamed to ‎packages/node/src/ethereum/utils/multisend-encoder.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/virtual-app-set-state-commitment.ts renamed to ‎packages/node/src/ethereum/virtual-app-set-state-commitment.ts

File renamed without changes.

‎packages/node/src/machine/ethereum/withdraw-eth-commitment.ts renamed to ‎packages/node/src/ethereum/withdraw-eth-commitment.ts

File renamed without changes.

‎packages/node/src/machine/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import { Opcode, Protocol } from "./enums";
2-
import { appIdentityToHash } from "./ethereum/utils/app-identity";
3-
import { InstructionExecutor } from "./instruction-executor";
1+
import { appIdentityToHash } from "../ethereum/utils/app-identity";
42
import {
53
AppInstance,
64
AppInstanceJson,
75
StateChannel,
86
StateChannelJSON
9-
} from "./models";
7+
} from "../models";
8+
9+
import { Opcode, Protocol } from "./enums";
10+
import { InstructionExecutor } from "./instruction-executor";
1011
import {
1112
Context,
1213
InstallParams,

‎packages/node/src/machine/instruction-executor.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { NetworkContext } from "@counterfactual/types";
22
import { BaseProvider } from "ethers/providers";
33

4+
import { StateChannel } from "../models";
5+
import { getProtocolFromName } from "../protocol";
6+
47
import { Opcode, Protocol } from "./enums";
58
import { MiddlewareContainer } from "./middleware";
6-
import { StateChannel } from "./models";
7-
import { getProtocolFromName } from "./protocol";
89
import {
910
Context,
1011
InstallParams,

‎packages/node/src/machine/models/index.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎packages/node/src/machine/types.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import {
77
import { BaseProvider } from "ethers/providers";
88
import { BigNumber, Signature } from "ethers/utils";
99

10+
import { Transaction } from "../ethereum/types";
11+
import { StateChannel } from "../models";
12+
1013
import { Opcode, Protocol } from "./enums";
11-
import { Transaction } from "./ethereum/types";
12-
import { StateChannel } from "./models";
1314

1415
export type ProtocolExecutionFlow = {
1516
[x: number]: (context: Context) => AsyncIterableIterator<any[]>;

‎packages/node/src/machine/models/app-instance.ts renamed to ‎packages/node/src/models/app-instance.ts

File renamed without changes.

‎packages/node/src/machine/models/eth-virtual-app-agreement-instance.ts renamed to ‎packages/node/src/models/eth-virtual-app-agreement-instance.ts

File renamed without changes.

‎packages/node/src/models/index.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1-
export * from "./proposed-app-instance-info";
1+
import { AppInstance, AppInstanceJson } from "./app-instance";
2+
import {
3+
ETHVirtualAppAgreementInstance,
4+
ETHVirtualAppAgreementJson
5+
} from "./eth-virtual-app-agreement-instance";
6+
import {
7+
ProposedAppInstanceInfo,
8+
ProposedAppInstanceInfoJSON
9+
} from "./proposed-app-instance-info";
10+
import { StateChannel, StateChannelJSON } from "./state-channel";
11+
12+
export {
13+
AppInstance,
14+
AppInstanceJson,
15+
ETHVirtualAppAgreementInstance,
16+
ETHVirtualAppAgreementJson,
17+
ProposedAppInstanceInfo,
18+
ProposedAppInstanceInfoJSON,
19+
StateChannel,
20+
StateChannelJSON
21+
};

‎packages/node/src/machine/models/state-channel.ts renamed to ‎packages/node/src/models/state-channel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
getETHBucketAppInterface,
1212
unlimitedETH
1313
} from "../ethereum/utils/eth-bucket";
14-
import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../xkeys";
14+
import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../machine/xkeys";
1515

1616
import { AppInstance, AppInstanceJson } from "./app-instance";
1717
import {

‎packages/node/src/machine/protocol/index.ts renamed to ‎packages/node/src/protocol/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Protocol } from "../enums";
2-
import { ProtocolExecutionFlow } from "../types";
1+
import { Protocol } from "../machine/enums";
2+
import { ProtocolExecutionFlow } from "../machine/types";
33

44
import { INSTALL_PROTOCOL } from "./install";
55
import { INSTALL_VIRTUAL_APP_PROTOCOL } from "./install-virtual-app";

‎packages/node/src/machine/protocol/install-virtual-app.ts renamed to ‎packages/node/src/protocol/install-virtual-app.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ import {
77
import { AddressZero } from "ethers/constants";
88
import { bigNumberify, BigNumberish } from "ethers/utils";
99

10-
import { Opcode } from "../enums";
1110
import { ETHVirtualAppAgreementCommitment } from "../ethereum/eth-virtual-app-agreement-commitment";
1211
import { VirtualAppSetStateCommitment } from "../ethereum/virtual-app-set-state-commitment";
13-
import {
14-
AppInstance,
15-
ETHVirtualAppAgreementInstance,
16-
StateChannel
17-
} from "../models";
12+
import { Opcode } from "../machine/enums";
1813
import {
1914
Context,
2015
InstallVirtualAppParams,
2116
ProtocolExecutionFlow,
2217
ProtocolParameters
23-
} from "../types";
24-
import { virtualChannelKey } from "../virtual-app-key";
25-
import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../xkeys";
18+
} from "../machine/types";
19+
import { virtualChannelKey } from "../machine/virtual-app-key";
20+
import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../machine/xkeys";
21+
import {
22+
AppInstance,
23+
ETHVirtualAppAgreementInstance,
24+
StateChannel
25+
} from "../models";
2626

2727
import { getChannelFromCounterparty } from "./utils/get-channel-from-counterparty";
2828
import { validateSignature } from "./utils/signature-validator";

‎packages/node/src/machine/protocol/install.ts renamed to ‎packages/node/src/protocol/install.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { AssetType, NetworkContext } from "@counterfactual/types";
22

3-
import { ProtocolExecutionFlow } from "..";
4-
import { Opcode, Protocol } from "../enums";
53
import { InstallCommitment } from "../ethereum";
4+
import { ProtocolExecutionFlow } from "../machine";
5+
import { Opcode, Protocol } from "../machine/enums";
6+
import { Context, InstallParams, ProtocolParameters } from "../machine/types";
7+
import { xkeyKthAddress } from "../machine/xkeys";
68
import { AppInstance, StateChannel } from "../models";
7-
import { Context, InstallParams, ProtocolParameters } from "../types";
8-
import { xkeyKthAddress } from "../xkeys";
99

1010
import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
1111
import { validateSignature } from "./utils/signature-validator";

‎packages/node/src/machine/protocol/setup.ts renamed to ‎packages/node/src/protocol/setup.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { AssetType, NetworkContext } from "@counterfactual/types";
22

3-
import { ProtocolExecutionFlow } from "..";
4-
import { Opcode, Protocol } from "../enums";
53
import { SetupCommitment } from "../ethereum";
4+
import { ProtocolExecutionFlow } from "../machine";
5+
import { Opcode, Protocol } from "../machine/enums";
6+
import { Context, ProtocolParameters, SetupParams } from "../machine/types";
7+
import { xkeyKthAddress } from "../machine/xkeys";
68
import { StateChannel } from "../models/state-channel";
7-
import { Context, ProtocolParameters, SetupParams } from "../types";
8-
import { xkeyKthAddress } from "../xkeys";
99

1010
import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
1111
import { validateSignature } from "./utils/signature-validator";

‎packages/node/src/machine/protocol/take-action.ts renamed to ‎packages/node/src/protocol/take-action.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { BaseProvider } from "ethers/providers";
22

3-
import { ProtocolExecutionFlow } from "..";
4-
import { Opcode } from "../enums";
53
import { SetStateCommitment } from "../ethereum";
4+
import { ProtocolExecutionFlow } from "../machine";
5+
import { Opcode } from "../machine/enums";
6+
import { Context, ProtocolMessage, TakeActionParams } from "../machine/types";
7+
import { xkeyKthAddress } from "../machine/xkeys";
68
import { StateChannel } from "../models/state-channel";
7-
import { Context, ProtocolMessage, TakeActionParams } from "../types";
8-
import { xkeyKthAddress } from "../xkeys";
99

1010
import { validateSignature } from "./utils/signature-validator";
1111

‎packages/node/src/machine/protocol/uninstall-virtual-app.ts renamed to ‎packages/node/src/protocol/uninstall-virtual-app.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import {
55
} from "@counterfactual/types";
66
import { BaseProvider } from "ethers/providers";
77

8-
import { ProtocolExecutionFlow } from "..";
9-
import { Opcode } from "../enums";
108
import { UninstallCommitment, VirtualAppSetStateCommitment } from "../ethereum";
11-
import { StateChannel } from "../models";
9+
import { ProtocolExecutionFlow } from "../machine";
10+
import { Opcode } from "../machine/enums";
1211
import {
1312
Context,
1413
ProtocolParameters,
1514
UninstallVirtualAppParams
16-
} from "../types";
17-
import { virtualChannelKey } from "../virtual-app-key";
18-
import { xkeyKthAddress } from "../xkeys";
15+
} from "../machine/types";
16+
import { virtualChannelKey } from "../machine/virtual-app-key";
17+
import { xkeyKthAddress } from "../machine/xkeys";
18+
import { StateChannel } from "../models";
1919

2020
import { getChannelFromCounterparty } from "./utils/get-channel-from-counterparty";
2121
import { computeFreeBalanceIncrements } from "./utils/get-resolution-increments";

‎packages/node/src/machine/protocol/uninstall.ts renamed to ‎packages/node/src/protocol/uninstall.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { AssetType, ETHBucketAppState } from "@counterfactual/types";
22
import { BaseProvider } from "ethers/providers";
33

4-
import { Protocol, ProtocolExecutionFlow } from "..";
5-
import { Opcode } from "../enums";
64
import { UninstallCommitment } from "../ethereum";
5+
import { Protocol, ProtocolExecutionFlow } from "../machine";
6+
import { Opcode } from "../machine/enums";
7+
import { Context, ProtocolParameters, UninstallParams } from "../machine/types";
8+
import { xkeyKthAddress } from "../machine/xkeys";
79
import { StateChannel } from "../models";
8-
import { Context, ProtocolParameters, UninstallParams } from "../types";
9-
import { xkeyKthAddress } from "../xkeys";
1010

1111
import {
1212
computeFreeBalanceIncrements,

‎packages/node/src/machine/protocol/update.ts renamed to ‎packages/node/src/protocol/update.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { NetworkContext } from "@counterfactual/types";
22

3-
import { ProtocolExecutionFlow } from "..";
4-
import { Opcode, Protocol } from "../enums";
53
import { SetStateCommitment } from "../ethereum";
4+
import { ProtocolExecutionFlow } from "../machine";
5+
import { Opcode, Protocol } from "../machine/enums";
6+
import { Context, ProtocolParameters, UpdateParams } from "../machine/types";
7+
import { xkeyKthAddress } from "../machine/xkeys";
68
import { StateChannel } from "../models/state-channel";
7-
import { Context, ProtocolParameters, UpdateParams } from "../types";
8-
import { xkeyKthAddress } from "../xkeys";
99

1010
import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
1111
import { validateSignature } from "./utils/signature-validator";

‎packages/node/src/machine/protocol/utils/get-channel-from-counterparty.ts renamed to ‎packages/node/src/protocol/utils/get-channel-from-counterparty.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { StateChannel } from "../..";
1+
import { StateChannel } from "../../machine";
22

33
/**
44
* Gets a StateChannel from a map of them based on the counterparties

‎packages/node/src/machine/protocol/utils/get-resolution-increments.ts renamed to ‎packages/node/src/protocol/utils/get-resolution-increments.ts

File renamed without changes.

‎packages/node/src/machine/protocol/utils/signature-forwarder.ts renamed to ‎packages/node/src/protocol/utils/signature-forwarder.ts

File renamed without changes.

‎packages/node/src/machine/protocol/utils/signature-validator.ts renamed to ‎packages/node/src/protocol/utils/signature-validator.ts

File renamed without changes.

‎packages/node/src/machine/protocol/withdraw-eth.ts renamed to ‎packages/node/src/protocol/withdraw-eth.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ import {
55
} from "@counterfactual/types";
66
import { AddressZero, Zero } from "ethers/constants";
77

8-
import { ProtocolExecutionFlow } from "..";
9-
import { Opcode, Protocol } from "../enums";
108
import {
119
InstallCommitment,
1210
UninstallCommitment,
1311
WithdrawETHCommitment
1412
} from "../ethereum";
15-
import { AppInstance, StateChannel } from "../models";
13+
import { ProtocolExecutionFlow } from "../machine";
14+
import { Opcode, Protocol } from "../machine/enums";
1615
import {
1716
Context,
1817
ProtocolMessage,
1918
ProtocolParameters,
2019
WithdrawParams
21-
} from "../types";
22-
import { xkeyKthAddress } from "../xkeys";
20+
} from "../machine/types";
21+
import { xkeyKthAddress } from "../machine/xkeys";
22+
import { AppInstance, StateChannel } from "../models";
2323

2424
import { validateSignature } from "./utils/signature-validator";
2525

‎packages/node/test/machine/integration/eth-virtual-app-agreement-commitment.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { AddressZero, HashZero } from "ethers/constants";
88
import { JsonRpcProvider } from "ethers/providers";
99
import { BigNumber, Interface, parseEther } from "ethers/utils";
1010

11-
import { SetStateCommitment } from "../../../src/machine/ethereum";
12-
import { ETHVirtualAppAgreementCommitment } from "../../../src/machine/ethereum/eth-virtual-app-agreement-commitment";
13-
import { AppInstance, StateChannel } from "../../../src/machine/models";
11+
import { SetStateCommitment } from "../../../src/ethereum";
12+
import { ETHVirtualAppAgreementCommitment } from "../../../src/ethereum/eth-virtual-app-agreement-commitment";
1413
import { xkeysToSortedKthSigningKeys } from "../../../src/machine/xkeys";
14+
import { AppInstance, StateChannel } from "../../../src/models";
1515

1616
import { toBeEq } from "./bignumber-jest-matcher";
1717
import { connectToGanache } from "./connect-ganache";

‎packages/node/test/machine/integration/install-then-set-state.spec.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ import { AddressZero, WeiPerEther, Zero } from "ethers/constants";
77
import { JsonRpcProvider } from "ethers/providers";
88
import { Interface, keccak256, parseEther } from "ethers/utils";
99

10-
import {
11-
InstallCommitment,
12-
SetStateCommitment
13-
} from "../../../src/machine/ethereum";
14-
import { AppInstance, StateChannel } from "../../../src/machine/models";
10+
import { InstallCommitment, SetStateCommitment } from "../../../src/ethereum";
1511
import { xkeysToSortedKthSigningKeys } from "../../../src/machine/xkeys";
12+
import { AppInstance, StateChannel } from "../../../src/models";
1613

1714
import { toBeEq } from "./bignumber-jest-matcher";
1815
import { connectToGanache } from "./connect-ganache";

‎packages/node/test/machine/integration/mininode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { JsonRpcProvider } from "ethers/providers";
33
import { SigningKey } from "ethers/utils";
44
import { HDNode } from "ethers/utils/hdnode";
55

6+
import { EthereumCommitment } from "../../../src/ethereum/types";
67
import {
78
InstructionExecutor,
89
Opcode,
910
StateChannel
1011
} from "../../../src/machine";
11-
import { EthereumCommitment } from "../../../src/machine/ethereum/types";
1212

1313
import { getRandomHDNodes } from "./random-signing-keys";
1414

‎packages/node/test/machine/integration/set-state.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { AssetType, NetworkContext } from "@counterfactual/types";
33
import { Contract, Wallet } from "ethers";
44
import { AddressZero, WeiPerEther } from "ethers/constants";
55

6+
import { SetStateCommitment } from "../../../src/ethereum";
67
import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
7-
import { SetStateCommitment } from "../../../src/machine/ethereum";
8-
import { StateChannel } from "../../../src/machine/models";
8+
import { StateChannel } from "../../../src/models";
99

1010
import { toBeEq } from "./bignumber-jest-matcher";
1111
import { connectToGanache } from "./connect-ganache";

‎packages/node/test/machine/integration/setup-then-set-state.spec.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ import { WeiPerEther, Zero } from "ethers/constants";
77
import { JsonRpcProvider } from "ethers/providers";
88
import { Interface, keccak256 } from "ethers/utils";
99

10+
import { SetStateCommitment, SetupCommitment } from "../../../src/ethereum";
1011
import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
11-
import {
12-
SetStateCommitment,
13-
SetupCommitment
14-
} from "../../../src/machine/ethereum";
15-
import { StateChannel } from "../../../src/machine/models";
12+
import { StateChannel } from "../../../src/models";
1613

1714
import { toBeEq } from "./bignumber-jest-matcher";
1815
import { connectToGanache } from "./connect-ganache";

‎packages/node/test/machine/integration/virtual-app-set-state-commitment.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { Contract, Wallet } from "ethers";
66
import { AddressZero, WeiPerEther } from "ethers/constants";
77
import { Signature, SigningKey } from "ethers/utils";
88

9+
import { VirtualAppSetStateCommitment } from "../../../src/ethereum/virtual-app-set-state-commitment";
910
import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
10-
import { VirtualAppSetStateCommitment } from "../../../src/machine/ethereum/virtual-app-set-state-commitment";
11-
import { AppInstance, StateChannel } from "../../../src/machine/models";
11+
import { AppInstance, StateChannel } from "../../../src/models";
1212

1313
import { toBeEq } from "./bignumber-jest-matcher";
1414
import { connectToGanache } from "./connect-ganache";

‎packages/node/test/machine/unit/ethereum/eth-virtual-app-agreement-commitment.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import {
1212
} from "ethers/utils";
1313
import { fromSeed } from "ethers/utils/hdnode";
1414

15+
import { ETHVirtualAppAgreementCommitment } from "../../../../src/ethereum/eth-virtual-app-agreement-commitment";
16+
import { Transaction } from "../../../../src/ethereum/types";
17+
import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
1518
import { StateChannel } from "../../../../src/machine";
16-
import { ETHVirtualAppAgreementCommitment } from "../../../../src/machine/ethereum/eth-virtual-app-agreement-commitment";
17-
import { Transaction } from "../../../../src/machine/ethereum/types";
18-
import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
1919
import { generateRandomNetworkContext } from "../../mocks";
2020

2121
/**

‎packages/node/test/machine/unit/ethereum/install-commitment.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import {
1313
} from "ethers/utils";
1414
import { fromSeed } from "ethers/utils/hdnode";
1515

16-
import { InstallCommitment } from "../../../../src/machine/ethereum";
17-
import { MultisigTransaction } from "../../../../src/machine/ethereum/types";
18-
import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
19-
import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
20-
import { AppInstance, StateChannel } from "../../../../src/machine/models";
16+
import { InstallCommitment } from "../../../../src/ethereum";
17+
import { MultisigTransaction } from "../../../../src/ethereum/types";
18+
import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
19+
import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
20+
import { AppInstance, StateChannel } from "../../../../src/models";
2121
import { generateRandomNetworkContext } from "../../mocks";
2222

2323
/**

‎packages/node/test/machine/unit/ethereum/set-state-commitment.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import {
1212
TransactionDescription
1313
} from "ethers/utils";
1414

15-
import { SetStateCommitment } from "../../../../src/machine/ethereum";
16-
import { Transaction } from "../../../../src/machine/ethereum/types";
17-
import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
18-
import { AppInstance } from "../../../../src/machine/models";
15+
import { SetStateCommitment } from "../../../../src/ethereum";
16+
import { Transaction } from "../../../../src/ethereum/types";
17+
import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
18+
import { AppInstance } from "../../../../src/models";
1919
import { generateRandomNetworkContext } from "../../mocks";
2020

2121
/**

0 commit comments

Comments
 (0)