[node] Moves files from machine subfolder to higher order folder (#1333)

* Moves files from machine subfolder to higher order folder

* Add export

packages/node/src/machine/index.ts

@@ -1,12 +1,13 @@
-import { Opcode, Protocol } from "./enums";
-import { appIdentityToHash } from "./ethereum/utils/app-identity";
-import { InstructionExecutor } from "./instruction-executor";
+import { appIdentityToHash } from "../ethereum/utils/app-identity";
 import {
   AppInstance,
   AppInstanceJson,
   StateChannel,
   StateChannelJSON
-} from "./models";
+} from "../models";
+
+import { Opcode, Protocol } from "./enums";
+import { InstructionExecutor } from "./instruction-executor";
 import {
   Context,
   InstallParams,

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

@@ -1,10 +1,11 @@
 import { NetworkContext } from "@counterfactual/types";
 import { BaseProvider } from "ethers/providers";
 
+import { StateChannel } from "../models";
+import { getProtocolFromName } from "../protocol";
+
 import { Opcode, Protocol } from "./enums";
 import { MiddlewareContainer } from "./middleware";
-import { StateChannel } from "./models";
-import { getProtocolFromName } from "./protocol";
 import {
   Context,
   InstallParams,

packages/node/src/machine/types.ts

@@ -7,9 +7,10 @@ import {
 import { BaseProvider } from "ethers/providers";
 import { BigNumber, Signature } from "ethers/utils";
 
+import { Transaction } from "../ethereum/types";
+import { StateChannel } from "../models";
+
 import { Opcode, Protocol } from "./enums";
-import { Transaction } from "./ethereum/types";
-import { StateChannel } from "./models";
 
 export type ProtocolExecutionFlow = {
   [x: number]: (context: Context) => AsyncIterableIterator<any[]>;

packages/node/src/models/index.ts

@@ -1 +1,21 @@
-export * from "./proposed-app-instance-info";
+import { AppInstance, AppInstanceJson } from "./app-instance";
+import {
+  ETHVirtualAppAgreementInstance,
+  ETHVirtualAppAgreementJson
+} from "./eth-virtual-app-agreement-instance";
+import {
+  ProposedAppInstanceInfo,
+  ProposedAppInstanceInfoJSON
+} from "./proposed-app-instance-info";
+import { StateChannel, StateChannelJSON } from "./state-channel";
+
+export {
+  AppInstance,
+  AppInstanceJson,
+  ETHVirtualAppAgreementInstance,
+  ETHVirtualAppAgreementJson,
+  ProposedAppInstanceInfo,
+  ProposedAppInstanceInfoJSON,
+  StateChannel,
+  StateChannelJSON
+};

packages/node/src/machine/models/state-channel.ts → packages/node/src/models/state-channel.ts

@@ -11,7 +11,7 @@ import {
   getETHBucketAppInterface,
   unlimitedETH
 } from "../ethereum/utils/eth-bucket";
-import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../xkeys";
+import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../machine/xkeys";
 
 import { AppInstance, AppInstanceJson } from "./app-instance";
 import {

packages/node/src/machine/protocol/index.ts → packages/node/src/protocol/index.ts

@@ -1,5 +1,5 @@
-import { Protocol } from "../enums";
-import { ProtocolExecutionFlow } from "../types";
+import { Protocol } from "../machine/enums";
+import { ProtocolExecutionFlow } from "../machine/types";
 
 import { INSTALL_PROTOCOL } from "./install";
 import { INSTALL_VIRTUAL_APP_PROTOCOL } from "./install-virtual-app";

packages/node/src/machine/protocol/install-virtual-app.ts → packages/node/src/protocol/install-virtual-app.ts

@@ -7,22 +7,22 @@ import {
 import { AddressZero } from "ethers/constants";
 import { bigNumberify, BigNumberish } from "ethers/utils";
 
-import { Opcode } from "../enums";
 import { ETHVirtualAppAgreementCommitment } from "../ethereum/eth-virtual-app-agreement-commitment";
 import { VirtualAppSetStateCommitment } from "../ethereum/virtual-app-set-state-commitment";
-import {
-  AppInstance,
-  ETHVirtualAppAgreementInstance,
-  StateChannel
-} from "../models";
+import { Opcode } from "../machine/enums";
 import {
   Context,
   InstallVirtualAppParams,
   ProtocolExecutionFlow,
   ProtocolParameters
-} from "../types";
-import { virtualChannelKey } from "../virtual-app-key";
-import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../xkeys";
+} from "../machine/types";
+import { virtualChannelKey } from "../machine/virtual-app-key";
+import { xkeyKthAddress, xkeysToSortedKthAddresses } from "../machine/xkeys";
+import {
+  AppInstance,
+  ETHVirtualAppAgreementInstance,
+  StateChannel
+} from "../models";
 
 import { getChannelFromCounterparty } from "./utils/get-channel-from-counterparty";
 import { validateSignature } from "./utils/signature-validator";

packages/node/src/machine/protocol/install.ts → packages/node/src/protocol/install.ts

@@ -1,11 +1,11 @@
 import { AssetType, NetworkContext } from "@counterfactual/types";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import { InstallCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
+import { Context, InstallParams, ProtocolParameters } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { AppInstance, StateChannel } from "../models";
-import { Context, InstallParams, ProtocolParameters } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
 import { validateSignature } from "./utils/signature-validator";

packages/node/src/machine/protocol/setup.ts → packages/node/src/protocol/setup.ts

@@ -1,11 +1,11 @@
 import { AssetType, NetworkContext } from "@counterfactual/types";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import { SetupCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
+import { Context, ProtocolParameters, SetupParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models/state-channel";
-import { Context, ProtocolParameters, SetupParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
 import { validateSignature } from "./utils/signature-validator";

packages/node/src/machine/protocol/take-action.ts → packages/node/src/protocol/take-action.ts

@@ -1,11 +1,11 @@
 import { BaseProvider } from "ethers/providers";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode } from "../enums";
 import { SetStateCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode } from "../machine/enums";
+import { Context, ProtocolMessage, TakeActionParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models/state-channel";
-import { Context, ProtocolMessage, TakeActionParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { validateSignature } from "./utils/signature-validator";
 

packages/node/src/machine/protocol/uninstall-virtual-app.ts → packages/node/src/protocol/uninstall-virtual-app.ts

@@ -5,17 +5,17 @@ import {
 } from "@counterfactual/types";
 import { BaseProvider } from "ethers/providers";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode } from "../enums";
 import { UninstallCommitment, VirtualAppSetStateCommitment } from "../ethereum";
-import { StateChannel } from "../models";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode } from "../machine/enums";
 import {
   Context,
   ProtocolParameters,
   UninstallVirtualAppParams
-} from "../types";
-import { virtualChannelKey } from "../virtual-app-key";
-import { xkeyKthAddress } from "../xkeys";
+} from "../machine/types";
+import { virtualChannelKey } from "../machine/virtual-app-key";
+import { xkeyKthAddress } from "../machine/xkeys";
+import { StateChannel } from "../models";
 
 import { getChannelFromCounterparty } from "./utils/get-channel-from-counterparty";
 import { computeFreeBalanceIncrements } from "./utils/get-resolution-increments";

packages/node/src/machine/protocol/uninstall.ts → packages/node/src/protocol/uninstall.ts

@@ -1,12 +1,12 @@
 import { AssetType, ETHBucketAppState } from "@counterfactual/types";
 import { BaseProvider } from "ethers/providers";
 
-import { Protocol, ProtocolExecutionFlow } from "..";
-import { Opcode } from "../enums";
 import { UninstallCommitment } from "../ethereum";
+import { Protocol, ProtocolExecutionFlow } from "../machine";
+import { Opcode } from "../machine/enums";
+import { Context, ProtocolParameters, UninstallParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models";
-import { Context, ProtocolParameters, UninstallParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import {
   computeFreeBalanceIncrements,

packages/node/src/machine/protocol/update.ts → packages/node/src/protocol/update.ts

@@ -1,11 +1,11 @@
 import { NetworkContext } from "@counterfactual/types";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import { SetStateCommitment } from "../ethereum";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
+import { Context, ProtocolParameters, UpdateParams } from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
 import { StateChannel } from "../models/state-channel";
-import { Context, ProtocolParameters, UpdateParams } from "../types";
-import { xkeyKthAddress } from "../xkeys";
 
 import { UNASSIGNED_SEQ_NO } from "./utils/signature-forwarder";
 import { validateSignature } from "./utils/signature-validator";

packages/node/src/machine/protocol/utils/get-channel-from-counterparty.ts → packages/node/src/protocol/utils/get-channel-from-counterparty.ts

@@ -1,4 +1,4 @@
-import { StateChannel } from "../..";
+import { StateChannel } from "../../machine";
 
 /**
  * Gets a StateChannel from a map of them based on the counterparties

packages/node/src/machine/protocol/withdraw-eth.ts → packages/node/src/protocol/withdraw-eth.ts

@@ -5,21 +5,21 @@ import {
 } from "@counterfactual/types";
 import { AddressZero, Zero } from "ethers/constants";
 
-import { ProtocolExecutionFlow } from "..";
-import { Opcode, Protocol } from "../enums";
 import {
   InstallCommitment,
   UninstallCommitment,
   WithdrawETHCommitment
 } from "../ethereum";
-import { AppInstance, StateChannel } from "../models";
+import { ProtocolExecutionFlow } from "../machine";
+import { Opcode, Protocol } from "../machine/enums";
 import {
   Context,
   ProtocolMessage,
   ProtocolParameters,
   WithdrawParams
-} from "../types";
-import { xkeyKthAddress } from "../xkeys";
+} from "../machine/types";
+import { xkeyKthAddress } from "../machine/xkeys";
+import { AppInstance, StateChannel } from "../models";
 
 import { validateSignature } from "./utils/signature-validator";
 

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

@@ -8,10 +8,10 @@ import { AddressZero, HashZero } from "ethers/constants";
 import { JsonRpcProvider } from "ethers/providers";
 import { BigNumber, Interface, parseEther } from "ethers/utils";
 
-import { SetStateCommitment } from "../../../src/machine/ethereum";
-import { ETHVirtualAppAgreementCommitment } from "../../../src/machine/ethereum/eth-virtual-app-agreement-commitment";
-import { AppInstance, StateChannel } from "../../../src/machine/models";
+import { SetStateCommitment } from "../../../src/ethereum";
+import { ETHVirtualAppAgreementCommitment } from "../../../src/ethereum/eth-virtual-app-agreement-commitment";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";

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

@@ -7,12 +7,9 @@ import { AddressZero, WeiPerEther, Zero } from "ethers/constants";
 import { JsonRpcProvider } from "ethers/providers";
 import { Interface, keccak256, parseEther } from "ethers/utils";
 
-import {
-  InstallCommitment,
-  SetStateCommitment
-} from "../../../src/machine/ethereum";
-import { AppInstance, StateChannel } from "../../../src/machine/models";
+import { InstallCommitment, SetStateCommitment } from "../../../src/ethereum";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine/xkeys";
+import { AppInstance, StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";

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

@@ -3,12 +3,12 @@ import { JsonRpcProvider } from "ethers/providers";
 import { SigningKey } from "ethers/utils";
 import { HDNode } from "ethers/utils/hdnode";
 
+import { EthereumCommitment } from "../../../src/ethereum/types";
 import {
   InstructionExecutor,
   Opcode,
   StateChannel
 } from "../../../src/machine";
-import { EthereumCommitment } from "../../../src/machine/ethereum/types";
 
 import { getRandomHDNodes } from "./random-signing-keys";
 

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

@@ -3,9 +3,9 @@ import { AssetType, NetworkContext } from "@counterfactual/types";
 import { Contract, Wallet } from "ethers";
 import { AddressZero, WeiPerEther } from "ethers/constants";
 
+import { SetStateCommitment } from "../../../src/ethereum";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
-import { SetStateCommitment } from "../../../src/machine/ethereum";
-import { StateChannel } from "../../../src/machine/models";
+import { StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";

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

@@ -7,12 +7,9 @@ import { WeiPerEther, Zero } from "ethers/constants";
 import { JsonRpcProvider } from "ethers/providers";
 import { Interface, keccak256 } from "ethers/utils";
 
+import { SetStateCommitment, SetupCommitment } from "../../../src/ethereum";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
-import {
-  SetStateCommitment,
-  SetupCommitment
-} from "../../../src/machine/ethereum";
-import { StateChannel } from "../../../src/machine/models";
+import { StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";

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

@@ -6,9 +6,9 @@ import { Contract, Wallet } from "ethers";
 import { AddressZero, WeiPerEther } from "ethers/constants";
 import { Signature, SigningKey } from "ethers/utils";
 
+import { VirtualAppSetStateCommitment } from "../../../src/ethereum/virtual-app-set-state-commitment";
 import { xkeysToSortedKthSigningKeys } from "../../../src/machine";
-import { VirtualAppSetStateCommitment } from "../../../src/machine/ethereum/virtual-app-set-state-commitment";
-import { AppInstance, StateChannel } from "../../../src/machine/models";
+import { AppInstance, StateChannel } from "../../../src/models";
 
 import { toBeEq } from "./bignumber-jest-matcher";
 import { connectToGanache } from "./connect-ganache";

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

@@ -12,10 +12,10 @@ import {
 } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
+import { ETHVirtualAppAgreementCommitment } from "../../../../src/ethereum/eth-virtual-app-agreement-commitment";
+import { Transaction } from "../../../../src/ethereum/types";
+import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
 import { StateChannel } from "../../../../src/machine";
-import { ETHVirtualAppAgreementCommitment } from "../../../../src/machine/ethereum/eth-virtual-app-agreement-commitment";
-import { Transaction } from "../../../../src/machine/ethereum/types";
-import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**

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

@@ -13,11 +13,11 @@ import {
 } from "ethers/utils";
 import { fromSeed } from "ethers/utils/hdnode";
 
-import { InstallCommitment } from "../../../../src/machine/ethereum";
-import { MultisigTransaction } from "../../../../src/machine/ethereum/types";
-import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
-import { decodeMultisendCalldata } from "../../../../src/machine/ethereum/utils/multisend-decoder";
-import { AppInstance, StateChannel } from "../../../../src/machine/models";
+import { InstallCommitment } from "../../../../src/ethereum";
+import { MultisigTransaction } from "../../../../src/ethereum/types";
+import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
+import { decodeMultisendCalldata } from "../../../../src/ethereum/utils/multisend-decoder";
+import { AppInstance, StateChannel } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**

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

@@ -12,10 +12,10 @@ import {
   TransactionDescription
 } from "ethers/utils";
 
-import { SetStateCommitment } from "../../../../src/machine/ethereum";
-import { Transaction } from "../../../../src/machine/ethereum/types";
-import { appIdentityToHash } from "../../../../src/machine/ethereum/utils/app-identity";
-import { AppInstance } from "../../../../src/machine/models";
+import { SetStateCommitment } from "../../../../src/ethereum";
+import { Transaction } from "../../../../src/ethereum/types";
+import { appIdentityToHash } from "../../../../src/ethereum/utils/app-identity";
+import { AppInstance } from "../../../../src/models";
 import { generateRandomNetworkContext } from "../../mocks";
 
 /**