From 910ab671dcb6e24c3bf1b1f304d9e1e3ddf491c1 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 26 Oct 2018 13:19:47 -0700
Subject: [PATCH] style: remove cicular imports

---
 web3.js/src/bpf-loader.js    |  7 +++++--
 web3.js/src/loader.js        |  7 +++++--
 web3.js/src/native-loader.js |  7 +++++--
 web3.js/src/token-program.js | 15 ++++++---------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/web3.js/src/bpf-loader.js b/web3.js/src/bpf-loader.js
index 2e57b56212..fe6051838a 100644
--- a/web3.js/src/bpf-loader.js
+++ b/web3.js/src/bpf-loader.js
@@ -2,9 +2,12 @@
 
 import elfy from 'elfy';
 
-import {Account, PublicKey, Loader, SystemProgram} from '.';
+import {Account} from './account';
+import {PublicKey} from './publickey';
+import {Loader} from './loader';
+import {SystemProgram} from './system-program';
 import {sendAndConfirmTransaction} from './util/send-and-confirm-transaction';
-import type {Connection} from '.';
+import type {Connection} from './connection';
 
 /**
  * Factory class for transactions to interact with a program loader
diff --git a/web3.js/src/loader.js b/web3.js/src/loader.js
index 6793942275..deeb7173c2 100644
--- a/web3.js/src/loader.js
+++ b/web3.js/src/loader.js
@@ -2,9 +2,12 @@
 
 import * as BufferLayout from 'buffer-layout';
 
-import {PublicKey, SystemProgram, Transaction} from '.';
+import {Account} from './account';
+import {PublicKey} from './publickey';
+import {SystemProgram} from './system-program';
+import {Transaction} from './transaction';
 import {sendAndConfirmTransaction} from './util/send-and-confirm-transaction';
-import type {Account, Connection} from '.';
+import type {Connection} from './connection';
 
 /**
  * Program loader interface
diff --git a/web3.js/src/native-loader.js b/web3.js/src/native-loader.js
index 2d77640a3f..01f86517bc 100644
--- a/web3.js/src/native-loader.js
+++ b/web3.js/src/native-loader.js
@@ -1,8 +1,11 @@
 // @flow
 
-import {Account, PublicKey, Loader, SystemProgram} from '.';
+import {Account} from './account';
+import {PublicKey} from './publickey';
+import {Loader} from './loader';
+import {SystemProgram} from './system-program';
 import {sendAndConfirmTransaction} from './util/send-and-confirm-transaction';
-import type {Connection} from '.';
+import type {Connection} from './connection';
 
 /**
  * Factory class for transactions to interact with a program loader
diff --git a/web3.js/src/token-program.js b/web3.js/src/token-program.js
index d64a81925e..3e69b02af0 100644
--- a/web3.js/src/token-program.js
+++ b/web3.js/src/token-program.js
@@ -7,15 +7,12 @@ import BN from 'bn.js';
 import * as BufferLayout from 'buffer-layout';
 
 import * as Layout from './layout';
-import {
-  Account,
-  PublicKey,
-  SystemProgram,
-  Transaction,
-  TransactionInstruction,
-  sendAndConfirmTransaction,
-} from '.';
-import type {Connection} from '.';
+import {Account} from './account';
+import {PublicKey} from './publickey';
+import {SystemProgram} from './system-program';
+import {Transaction, TransactionInstruction} from './transaction';
+import {sendAndConfirmTransaction} from './util/send-and-confirm-transaction';
+import type {Connection} from './connection';
 
 /**
  * Some amount of tokens