fix error in merge

This commit is contained in:
Ricardo Guilherme Schmidt
2023-09-26 02:41:52 -03:00
parent 6cf3528f01
commit 11bc73a42e
3 changed files with 13 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
| contracts/MiniMeToken.sol:MiniMeToken contract | | | | | | | contracts/MiniMeToken.sol:MiniMeToken contract | | | | | |
|------------------------------------------------|-----------------|--------|--------|---------|---------| |------------------------------------------------|-----------------|--------|--------|---------|---------|
| Deployment Cost | Deployment Size | | | | | | Deployment Cost | Deployment Size | | | | |
| 1788057 | 9919 | | | | | | 1793495 | 9955 | | | | |
| Function Name | min | avg | median | max | # calls | | Function Name | min | avg | median | max | # calls |
| allowance | 0 | 67 | 0 | 808 | 12 | | allowance | 0 | 67 | 0 | 808 | 12 |
| approve | 0 | 15995 | 23208 | 31708 | 9 | | approve | 0 | 15995 | 23208 | 31708 | 9 |
@@ -11,11 +11,11 @@
| changeController | 0 | 1014 | 758 | 3558 | 5 | | changeController | 0 | 1014 | 758 | 3558 | 5 |
| claimTokens | 9537 | 41277 | 57148 | 57148 | 3 | | claimTokens | 9537 | 41277 | 57148 | 57148 | 3 |
| controller | 0 | 0 | 0 | 0 | 7 | | controller | 0 | 0 | 0 | 0 | 7 |
| createCloneToken | 0 | 916398 | 916398 | 1832796 | 2 | | createCloneToken | 0 | 919122 | 919122 | 1838245 | 2 |
| decimals | 0 | 0 | 0 | 0 | 7 | | decimals | 0 | 0 | 0 | 0 | 7 |
| destroyTokens | 8956 | 8956 | 8956 | 8956 | 1 | | destroyTokens | 9001 | 9001 | 9001 | 9001 | 1 |
| enableTransfers | 0 | 0 | 0 | 0 | 3 | | enableTransfers | 0 | 0 | 0 | 0 | 3 |
| generateTokens | 0 | 8974 | 0 | 95751 | 32 | | generateTokens | 0 | 8979 | 0 | 95796 | 32 |
| name | 0 | 0 | 0 | 0 | 7 | | name | 0 | 0 | 0 | 0 | 7 |
| parentSnapShotBlock | 0 | 0 | 0 | 0 | 8 | | parentSnapShotBlock | 0 | 0 | 0 | 0 | 8 |
| parentToken | 0 | 0 | 0 | 0 | 8 | | parentToken | 0 | 0 | 0 | 0 | 8 |
@@ -29,9 +29,9 @@
| contracts/MiniMeTokenFactory.sol:MiniMeTokenFactory contract | | | | | | | contracts/MiniMeTokenFactory.sol:MiniMeTokenFactory contract | | | | | |
|--------------------------------------------------------------|-----------------|--------|--------|---------|---------| |--------------------------------------------------------------|-----------------|--------|--------|---------|---------|
| Deployment Cost | Deployment Size | | | | | | Deployment Cost | Deployment Size | | | | |
| 2111243 | 10577 | | | | | | 2118450 | 10613 | | | | |
| Function Name | min | avg | median | max | # calls | | Function Name | min | avg | median | max | # calls |
| createCloneToken | 0 | 912609 | 912609 | 1825218 | 2 | | createCloneToken | 0 | 915333 | 915333 | 1830667 | 2 |

View File

@@ -9,16 +9,16 @@ ClaimTokensTest:testClaimERC20() (gas: 63734)
ClaimTokensTest:testClaimETH() (gas: 13637) ClaimTokensTest:testClaimETH() (gas: 13637)
ClaimTokensTest:testClaimSelf() (gas: 61216) ClaimTokensTest:testClaimSelf() (gas: 61216)
ClaimTokensTest:testDeployment() (gas: 26595) ClaimTokensTest:testDeployment() (gas: 26595)
CreateCloneTokenTest:testCreateCloneToken() (gas: 1837160) CreateCloneTokenTest:testCreateCloneToken() (gas: 1842609)
CreateCloneTokenTest:testDeployment() (gas: 26550) CreateCloneTokenTest:testDeployment() (gas: 26550)
CreateCloneTokenTest:testGenerateTokens() (gas: 102022) CreateCloneTokenTest:testGenerateTokens() (gas: 102067)
DestroyTokensTest:testDeployment() (gas: 26595) DestroyTokensTest:testDeployment() (gas: 26595)
DestroyTokensTest:testDestroyTokens() (gas: 13456) DestroyTokensTest:testDestroyTokens() (gas: 13501)
GenerateTokensTest:testDeployment() (gas: 26550) GenerateTokensTest:testDeployment() (gas: 26550)
GenerateTokensTest:testGenerateTokens() (gas: 109461) GenerateTokensTest:testGenerateTokens() (gas: 109506)
GenerateTokensTest:test_RevertWhen_SenderIsNotController() (gas: 14951) GenerateTokensTest:test_RevertWhen_SenderIsNotController() (gas: 14951)
MiniMeTokenTest:testDeployment() (gas: 26535) MiniMeTokenTest:testDeployment() (gas: 26535)
ReentrancyTest:testAttack() (gas: 229331) ReentrancyTest:testAttack() (gas: 229376)
TransferTest:testDeployment() (gas: 26617) TransferTest:testDeployment() (gas: 26617)
TransferTest:testDoubleTransfer() (gas: 92391) TransferTest:testDoubleTransfer() (gas: 92391)
TransferTest:testDoubleTransfer2() (gas: 70610) TransferTest:testDoubleTransfer2() (gas: 70610)

View File

@@ -7,14 +7,14 @@ import { DeploymentConfig } from "../script/DeploymentConfig.s.sol";
import { NotAuthorized } from "../contracts/Controlled.sol"; import { NotAuthorized } from "../contracts/Controlled.sol";
import { import {
MiniMeToken,
TransfersDisabled, TransfersDisabled,
InvalidDestination, InvalidDestination,
NotEnoughBalance, NotEnoughBalance,
NotEnoughAllowance, NotEnoughAllowance,
AllowanceAlreadySet, AllowanceAlreadySet,
IERC20 IERC20
} from "../contracts/MiniMeToken.sol"; } from "../contracts/MiniMeBase.sol";
import { MiniMeToken } from "../contracts/MiniMeToken.sol";
import { MiniMeTokenFactory } from "../contracts/MiniMeTokenFactory.sol"; import { MiniMeTokenFactory } from "../contracts/MiniMeTokenFactory.sol";
import { ApproveAndCallFallBack } from "../contracts/ApproveAndCallFallBack.sol"; import { ApproveAndCallFallBack } from "../contracts/ApproveAndCallFallBack.sol";