Remove unused withdraw

Author: andy-at-mask

contracts/ito.sol

@@ -460,36 +460,4 @@ contract HappyTokenPool is Initializable {
             pool.ratios[i*2+1] = 0;
         }
     }
-
-    /**
-     * withdraw() transfers out a single token after a pool is expired or empty 
-     * id                    swap pool id
-     * addr_i                withdraw token index
-     * this function can only be called by the pool creator. after validation, it transfers the addr_i th token 
-     * out to the pool creator address.
-    **/
-
-    function withdraw (bytes32 id, uint256 addr_i) public {
-        Pool storage pool = pool_by_id[id];
-        require(msg.sender == pool.creator, "Only the pool creator can withdraw.");
-
-        uint256 withdraw_balance = pool.exchanged_tokens[addr_i];
-        require(withdraw_balance > 0, "None of this token left");
-        uint256 expiration = pool.packed3.end_time + base_time;
-        uint256 remaining_tokens = pool.packed2.total_tokens;
-        // only after expiration or the pool is empty
-        require(expiration <= block.timestamp || remaining_tokens == 0, "Not expired yet");
-        address token_address = pool.exchange_addrs[addr_i];
-
-        // clear the record
-        pool.exchanged_tokens[addr_i] = 0;
-
-        // ERC20
-        if (token_address != DEFAULT_ADDRESS)
-            IERC20(token_address).safeTransfer(msg.sender, withdraw_balance);
-        // ETH
-        else
-            payable(msg.sender).transfer(withdraw_balance);
-        emit WithdrawSuccess(id, token_address, withdraw_balance);
-    }
 }

test/TestTP.js

@@ -1284,71 +1284,6 @@ describe('HappyTokenPool', () => {
         });
     });
 
-    describe('withdraw()', async () => {
-        beforeEach(async () => {
-            await testTokenADeployed.approve(happyTokenPoolDeployed.address, new BigNumber('1e27').toFixed());
-        });
-
-        it('Should emit WithdrawSuccess event and withdraw the specified token', async () => {
-            const fakeTime = (new Date().getTime() + 1000 * 1000) / 1000;
-            fpp.end_time = Math.ceil(fakeTime) - base_timestamp;
-            fpp.exchange_ratios = [1, 75000, 1, 100, 1, 100];
-            fpp.limit = BigNumber('50000e18').toFixed();
-            fpp.total_tokens = BigNumber('50000e18').toFixed();
-            const { id: pool_id } = await getResultFromPoolFill(happyTokenPoolDeployed, fpp);
-
-            const exchange_ETH_amount = BigNumber('3e14').toFixed();
-
-            const { verification, validation } = getVerification(PASSWORD, signers[2].address);
-            await happyTokenPoolDeployed
-                .connect(signers[2])
-                .swap(pool_id, verification, ETH_address_index, exchange_ETH_amount, [pool_id], {
-                    value: exchange_ETH_amount,
-                });
-
-            const exchange_tokenB_amount = BigNumber('200e18').toFixed();
-            await approveThenSwapToken(
-                testTokenBDeployed,
-                signers[3],
-                tokenB_address_index,
-                pool_id,
-                exchange_tokenB_amount,
-            );
-
-            // "none-pool owner" can not withdraw
-            const account_not_creator = signers[4];
-            await expect(
-                happyTokenPoolDeployed.connect(account_not_creator).withdraw(pool_id, ETH_address_index),
-            ).to.be.rejectedWith(Error);
-
-            await helper.advanceTimeAndBlock(2000 * 1000);
-            await happyTokenPoolDeployed.connect(creator).withdraw(pool_id, tokenB_address_index);
-            await happyTokenPoolDeployed.connect(creator).withdraw(pool_id, ETH_address_index);
-
-            // can not withdraw again
-            expect(happyTokenPoolDeployed.connect(creator).withdraw(pool_id, ETH_address_index)).to.be.rejectedWith(
-                Error,
-            );
-            expect(happyTokenPoolDeployed.connect(creator).withdraw(pool_id, tokenB_address_index)).to.be.rejectedWith(
-                Error,
-            );
-
-            const latestBlock = await ethers.provider.getBlockNumber();
-            const filter = happyTokenPoolDeployed.filters.WithdrawSuccess();
-            filter.fromBlock = latestBlock - 2;
-            filter.toBlock = latestBlock;
-            const logs = await ethers.provider.getLogs(filter);
-
-            let parsedLog = itoInterface.parseLog(logs[0]);
-            const logWithdrawTokenB = parsedLog.args;
-            parsedLog = itoInterface.parseLog(logs[1]);
-            const logWithdrawETH = parsedLog.args;
-
-            expect(logWithdrawTokenB.withdraw_balance.toString()).that.to.be.eq(BigNumber('200e18').toFixed());
-            expect(logWithdrawETH.withdraw_balance.toString()).that.to.be.eq(BigNumber('3e14').toFixed());
-        });
-    });
-
     describe('smart contract upgrade', async () => {
         let pool_user;
         let verification;