organize repo

* move fuzzer helper files to fuzzer files folder

* remove unused files.

Author: ilanDoron

.eslintignore

@@ -16,8 +16,8 @@ const MockUtils = artifacts.require("MockUtils.sol");
 
 const Helper = require("../helper.js");
 const BigNumber = require('bignumber.js');
-const ReserveSim = require("./simulator/simulator_orderbookReserve.js");
-const OrderGenerator = require("./simulator/tradeGenerator_orderbook.js");
+const ReserveSim = require("../test/sol4/orderBookFuzzer/simulator_orderbookReserve.js");
+const OrderGenerator = require("../test/sol4/orderBookFuzzer/tradeGenerator_orderbook.js");
 
 const lowRate = 42;
 
@@ -71,7 +71,7 @@ let minNewOrderWei;
 let baseKncPerEthRatePrecision;
 let dollarsPerEthPrecision = precisionUnits.mul(500);
 
-contract('OrderbookReserve simulator', async (accounts) => {
+contract('OrderbookReserve fuzzer', async (accounts) => {
 
     let expectedRate;
 
@@ -120,7 +120,7 @@ contract('OrderbookReserve simulator', async (accounts) => {
         firstFreeOrderIdPerReserveList = (await orders.nextFreeId()).valueOf();
     });
 
-    beforeEach('setup reserve contract for each test', async () => {
+    beforeEach('setup reserve contract', async () => {
         ethKncRate = initialEthKncRate;
         let ethToKncRatePrecision = precisionUnits.mul(ethKncRate);
         let kncToEthRatePrecision = precisionUnits.div(ethKncRate);

.eslintrc

@@ -5,7 +5,7 @@ const MatchingEngine = artifacts.require("KyberMatchingEngine.sol");
 const KyberStorage = artifacts.require("KyberStorage.sol");
 const RateHelper = artifacts.require("KyberRateHelper.sol");
 const TestToken = artifacts.require("TestToken.sol");
-const MaliciousReserve = artifacts.require("MaliciousReserve.sol");
+const MaliciousReserve = artifacts.require("MaliciousReserve2.sol");
 const KyberNetwork = artifacts.require("./KyberNetwork.sol");
 const NetworkNoMaxDest = artifacts.require("KyberNetworkNoMaxDest.sol");
 const MaliciousNetwork = artifacts.require("MaliciousKyberNetwork.sol");
@@ -118,7 +118,7 @@ contract('KyberProxyV1', function(accounts) {
         await kyberDao.setNetworkFeeBps(networkFeeBps);
 
         // deploy storage and network
-        storage = await KyberStorage.new(admin);
+        storage = await nwHelper.setupStorage(admin);
         network = await KyberNetwork.new(admin, storage.address);
         await storage.setNetworkContract(network.address, {from: admin});
         await storage.setFeeAccountedPerReserveType(true, true, true, false, true, true, {from: admin});

deployment_input.json scripts/deployment_input.json

@@ -1,6 +1,6 @@
 const BN = web3.utils.BN;
 const BASE = 100; // base for weighted operations
-const { zeroBN, zeroAddress } = require("../../test/helper.js");
+const { zeroBN, zeroAddress } = require("../../../helper.js");
 const { genRandomSeed, genRandomBN } = require("../randomNumberGenerator.js");
 
 //next operation options.

scripts/orderBookSimulator.js

@@ -1,8 +1,8 @@
-const Helper = require("../test/helper.js");
+const Helper = require("../../../helper.js");
 const BN = web3.utils.BN;
-const { DEPOSIT, DELEGATE, WITHDRAW, NO_ACTION } = require("./simulator/stakingActionsGenerator.js");
+const { DEPOSIT, DELEGATE, WITHDRAW, NO_ACTION } = require("./stakingActionsGenerator.js");
 const { expectRevert } = require('@openzeppelin/test-helpers');
-const StakeGenerator = require("./simulator/stakingActionsGenerator.js");
+const StakeGenerator = require("./stakingActionsGenerator.js");
 
 const winston = require("winston");
 const logger = winston.createLogger({
@@ -15,7 +15,7 @@ const logger = winston.createLogger({
 
 //global variables
 //////////////////
-const { zeroBN, zeroAddress } = require("../test/helper.js");
+const { zeroBN, zeroAddress } = require("../../../helper.js");
 const progressIterations = 20;
 
 // for keeping score

txparser.js scripts/txparser.js

@@ -1,15 +1,15 @@
-const Helper = require("../test/helper.js");
-const nwHelper = require("../test/sol6/networkHelper.js");
+const Helper = require("../../../helper.js");
+const nwHelper = require("../../networkHelper.js");
 
 const BN = web3.utils.BN;
 
-const { precisionUnits, zeroBN } = require("../test/helper.js");
+const { precisionUnits, zeroBN } = require("../../../helper.js");
 const { expectRevert } = require('@openzeppelin/test-helpers');
 
 const winston = require('winston');
 
-const TradeParamGenerator = require("./trades/tradeParamsGenerator.js");
-const { TRADE, UPDATE_RESERVE_RATE, RevertType, allRevertMessages } = require("./trades/tradeParamsGenerator.js");
+const TradeParamGenerator = require("./tradeParamsGenerator.js");
+const { TRADE, UPDATE_RESERVE_RATE, RevertType, allRevertMessages } = require("./tradeParamsGenerator.js");
 
 let numberSuccessfulTrades = 0;
 let numberGettingsZeroRates = 0;

scripts/weiPerSgd.js

@@ -1,15 +1,15 @@
 const BN = web3.utils.BN;
-const Helper = require("../../test/helper.js");
-const nwHelper = require("../../test/sol6/networkHelper.js");
+const Helper = require("../../../helper.js");
+const nwHelper = require("../../networkHelper.js");
 
 require("chai")
     .use(require("chai-as-promised"))
     .use(require("chai-bn")(BN))
     .should();
 
 
-const {BPS, ethDecimals, ethAddress, emptyHint, zeroBN, zeroAddress }  = require("../../test/helper.js")
-const { MASK_IN_HINTTYPE, MASK_OUT_HINTTYPE, SPLIT_HINTTYPE, BEST_OF_ALL_HINTTYPE }  = require('../../test/sol6/networkHelper.js');
+const {BPS, ethDecimals, ethAddress, emptyHint, zeroBN, zeroAddress }  = require("../../../helper.js");
+const { MASK_IN_HINTTYPE, MASK_OUT_HINTTYPE, SPLIT_HINTTYPE, BEST_OF_ALL_HINTTYPE }  = require('../../networkHelper.js');
 
 // Operations
 const TRADE = 'trade';

test/sol4/kyberProxyV1.js

@@ -4,7 +4,7 @@ const MockKyberStaking = artifacts.require("MockKyberStaking.sol");
 
 const Helper = require("../helper.js");
 const BN = web3.utils.BN;
-const StakeSimulator = require("../../scripts/stakingSimulator.js");
+const StakeSimulator = require("./fuzzerFiles/stakingFuzzer/stakingSimulator.js");
 const { precisionUnits } = require("../helper.js");
 
 //global variables

scripts/simulator/simulator_orderbookReserve.js test/sol4/orderBookFuzzer/simulator_orderbookReserve.js

@@ -15,7 +15,7 @@ const BN = web3.utils.BN;
 
 const { ReserveType }  = require('./networkHelper.js');
 
-const networkSimulator = require("../../scripts/networkSimulator.js");
+const networkSimulator = require("./fuzzerFiles/tradeFuzzer/networkSimulator.js");
 
 //global variables
 //////////////////