From 8b541109ec33f8df763c71e74d9a14088aa88d06 Mon Sep 17 00:00:00 2001
From: Ricardo Guilherme Schmidt <3esmit@gmail.com>
Date: Tue, 26 Sep 2023 12:36:30 -0300
Subject: [PATCH] fix gas snapshot and gas report

---
 .gas-report   |  1 +
 .gas-snapshot | 98 ++++++---------------------------------------------
 2 files changed, 11 insertions(+), 88 deletions(-)

diff --git a/.gas-report b/.gas-report
index 3b79bbf..8c171fc 100644
--- a/.gas-report
+++ b/.gas-report
@@ -30,3 +30,4 @@
 
 
 
+ 
diff --git a/.gas-snapshot b/.gas-snapshot
index 85a6a2d..dbdb82c 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,23 +1,8 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-AllowanceTest:testAllowance() (gas: 42712)
-AllowanceTest:testAllowanceAlreadySet() (gas: 36809)
-AllowanceTest:testAllowanceReset() (gas: 45925)
-AllowanceTest:testApproveAndCall() (gas: 98532)
-AllowanceTest:testApproveTransferDisabled() (gas: 7968)
-||||||| parent of fd986cf (add missing return on approve)
-AllowanceTest:testAllowance() (gas: 42712)
-AllowanceTest:testAllowanceAlreadySet() (gas: 36809)
-AllowanceTest:testAllowanceReset() (gas: 45925)
-AllowanceTest:testApproveAndCall() (gas: 98532)
-AllowanceTest:testApproveTransferDisabled() (gas: 7968)
-=======
 AllowanceTest:testAllowance() (gas: 42775)
 AllowanceTest:testAllowanceAlreadySet() (gas: 36905)
 AllowanceTest:testAllowanceReset() (gas: 46071)
 AllowanceTest:testApproveAndCall() (gas: 98617)
 AllowanceTest:testApproveTransferDisabled() (gas: 7994)
->>>>>>> fd986cf (add missing return on approve)
 AllowanceTest:testDeployment() (gas: 26711)
 AllowanceTest:testNoAllowance() (gas: 9462)
 AllowanceTest:testRejectedApproval() (gas: 13683)
@@ -43,33 +28,17 @@ ReceiveTest:testDeployment() (gas: 26595)
 ReceiveTest:testRejectingEther() (gas: 18691)
 ReentrancyTest:testAttack() (gas: 229445)
 TestPermit:testDeployment() (gas: 26573)
-TestPermit:testInvalidAllowance() (gas: 84344)
-TestPermit:testInvalidBalance() (gas: 67425)
-TestPermit:testPermit() (gas: 84547)
-TestPermit:testRevertExpiredPermit() (gas: 27878)
-TestPermit:testRevertInvalidNonce() (gas: 57309)
-TestPermit:testRevertInvalidSigner() (gas: 56070)
-TestPermit:testRevertSignatureReplay() (gas: 96596)
-TestPermit:testTransferFromLimitedPermit() (gas: 216258)
-TestPermit:testTransferFromMaxPermit() (gas: 236197)
+TestPermit:testInvalidAllowance() (gas: 84292)
+TestPermit:testInvalidBalance() (gas: 67373)
+TestPermit:testPermit() (gas: 84495)
+TestPermit:testRevertExpiredPermit() (gas: 27826)
+TestPermit:testRevertInvalidNonce() (gas: 57205)
+TestPermit:testRevertInvalidSigner() (gas: 56018)
+TestPermit:testRevertSignatureReplay() (gas: 96492)
+TestPermit:testTransferFromLimitedPermit() (gas: 216206)
+TestPermit:testTransferFromMaxPermit() (gas: 236145)
 TestSnapshotReads:testDeployment() (gas: 26550)
-<<<<<<< HEAD
-TestSnapshotReads:testSnapshotReads() (gas: 755896)
-||||||| parent of fd986cf (add missing return on approve)
-TestSnapshotReads:testSnapshotReads() (gas: 755896)
-TestPermit:testDeployment() (gas: 45858)
-TestPermit:testInvalidAllowance() (gas: 84397)
-TestPermit:testInvalidBalance() (gas: 67478)
-TestPermit:testPermit() (gas: 84644)
-TestPermit:testRevertExpiredPermit() (gas: 27953)
-TestPermit:testRevertInvalidNonce() (gas: 57362)
-TestPermit:testRevertInvalidSigner() (gas: 56145)
-TestPermit:testRevertSignatureReplay() (gas: 96746)
-TestPermit:testTransferFromLimitedPermit() (gas: 216308)
-TestPermit:testTransferFromMaxPermit() (gas: 236247)
-=======
 TestSnapshotReads:testSnapshotReads() (gas: 756322)
->>>>>>> fd986cf (add missing return on approve)
 TransferTest:testDeployment() (gas: 26617)
 TransferTest:testDoubleTransfer() (gas: 92425)
 TransferTest:testDoubleTransfer2() (gas: 70578)
@@ -83,51 +52,4 @@ TransferTest:testTransfer2() (gas: 59894)
 TransferTest:testTransferControllerZero() (gas: 59841)
 TransferTest:testTransferDisabled() (gas: 7968)
 TransferTest:testTransferFromDisabled() (gas: 6526)
-<<<<<<< HEAD
-TransferTest:testTransferNoBalance() (gas: 16972)
-||||||| parent of d658aa3 (Make MiniMe implement ERC2612)
-AllowanceTest:testAllowance() (gas: 244303)
-AllowanceTest:testDeployment() (gas: 45814)
-CreateCloneTokenTest:testCreateCloneToken() (gas: 2182389)
-CreateCloneTokenTest:testDeployment() (gas: 45769)
-CreateCloneTokenTest:testGenerateTokens() (gas: 2061699)
-DestroyTokensTest:testDeployment() (gas: 45598)
-DestroyTokensTest:testDestroyTokens() (gas: 124942)
-GenerateTokensTest:testDeployment() (gas: 45553)
-GenerateTokensTest:testGenerateTokens() (gas: 114621)
-GenerateTokensTest:test_RevertWhen_SenderIsNotController() (gas: 14930)
-MiniMeTokenTest:testDeployment() (gas: 45598)
-ReentrancyTest:testAttack() (gas: 229394)
-TransferTest:testDeployment() (gas: 45814)
-TransferTest:testTransfer() (gas: 201281)
-=======
-AllowanceTest:testAllowance() (gas: 244406)
-AllowanceTest:testDeployment() (gas: 45880)
-CreateCloneTokenTest:testCreateCloneToken() (gas: 2681910)
-CreateCloneTokenTest:testDeployment() (gas: 45835)
-CreateCloneTokenTest:testGenerateTokens() (gas: 2561311)
-DestroyTokensTest:testDeployment() (gas: 45664)
-DestroyTokensTest:testDestroyTokens() (gas: 124942)
-GenerateTokensTest:testDeployment() (gas: 45619)
-GenerateTokensTest:testGenerateTokens() (gas: 114621)
-GenerateTokensTest:testRevertWhen_SenderIsNotController() (gas: 14930)
-MiniMeTokenTest:testDeployment() (gas: 45664)
-ReentrancyTest:testAttack() (gas: 229482)
-TestPermit:testDeployment() (gas: 45858)
-TestPermit:testInvalidAllowance() (gas: 84397)
-TestPermit:testInvalidBalance() (gas: 67478)
-TestPermit:testPermit() (gas: 84644)
-TestPermit:testRevertExpiredPermit() (gas: 27953)
-TestPermit:testRevertInvalidNonce() (gas: 57362)
-TestPermit:testRevertInvalidSigner() (gas: 56145)
-TestPermit:testRevertSignatureReplay() (gas: 96746)
-TestPermit:testTransferFromLimitedPermit() (gas: 216308)
-TestPermit:testTransferFromMaxPermit() (gas: 236247)
-TransferTest:testDeployment() (gas: 45880)
-TransferTest:testTransfer() (gas: 201303)
->>>>>>> d658aa3 (Make MiniMe implement ERC2612)
-||||||| parent of fd986cf (add missing return on approve)
-TransferTest:testTransferNoBalance() (gas: 16972)
-=======
-TransferTest:testTransferNoBalance() (gas: 16927)
->>>>>>> fd986cf (add missing return on approve)
+TransferTest:testTransferNoBalance() (gas: 16927)
\ No newline at end of file