✏️ Remove @frak mapping in favor of contracts/

frak-id · Nov 4, 2023 · 6d406e0 · 6d406e0
1 parent 55c5222
commit 6d406e0
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 66 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -24,7 +24,7 @@ FrakTeasuryWalletTest:test_transfer_NotEnoughTreasury_ko() (gas: 11321404)
 FrakTeasuryWalletTest:test_transfer_NotMinter_ko() (gas: 17684)
 FrakTeasuryWalletTest:test_transfer_RewardTooLarge_ko() (gas: 20534)
 FrakTeasuryWalletTest:test_transfer_ok() (gas: 136126)
-FrakTokenTest:invariant_cap_lt_supply() (runs: 256, calls: 3840, reverts: 3470)
+FrakTokenTest:invariant_cap_lt_supply() (runs: 256, calls: 3840, reverts: 3451)
 FrakTokenTest:test_burn_ok() (gas: 53321)
 FrakTokenTest:test_canBeDeployedAndInit_ok() (gas: 4949212)
 FrakTokenTest:test_cap_ok() (gas: 10366)
@@ -39,11 +39,11 @@ FrakTokenTest:test_permit_InvalidNonce_ko() (gas: 50335)
 FrakTokenTest:test_permit_InvalidSigner_ko() (gas: 53944)
 FrakTokenTest:test_permit_ok() (gas: 77781)
 FrakTokenTest:test_symbol_ok() (gas: 14797)
-FraktionCostBadgesTest:test_defaultPrice_InvalidFraktionType_ko() (gas: 46597)
-FraktionCostBadgesTest:test_defaultPrice_ok() (gas: 26214)
-FraktionCostBadgesTest:test_updatePrice_InvalidFraktionType_ko() (gas: 46266)
-FraktionCostBadgesTest:test_updatePrice_InvalidRole_ko() (gas: 17661)
-FraktionCostBadgesTest:test_updatePrice_ok() (gas: 126566)
+FraktionCostBadgesTest:test_defaultPrice_InvalidFraktionType_ko() (gas: 46509)
+FraktionCostBadgesTest:test_defaultPrice_ok() (gas: 26126)
+FraktionCostBadgesTest:test_updatePrice_InvalidFraktionType_ko() (gas: 46442)
+FraktionCostBadgesTest:test_updatePrice_InvalidRole_ko() (gas: 17705)
+FraktionCostBadgesTest:test_updatePrice_ok() (gas: 126654)
 FraktionTokensTest:test_addContent_InvalidRole_ko() (gas: 18870)
 FraktionTokensTest:test_addContent_SupplyUpdateNotAllowed_ko() (gas: 75241)
 FraktionTokensTest:test_addContent_ok() (gas: 330174)
@@ -61,20 +61,23 @@ FraktionTokensTest:test_supply_InvalidRole_ko() (gas: 53455)
 FraktionTokensTest:test_supply_SupplyUpdateNotAllowed_ko() (gas: 45998)
 FraktionTokensTest:test_supply_ok() (gas: 87798)
 FraktionTokensTest:test_transferAllFrom_ok() (gas: 189678)
-MinterTest:test_addContent_InvalidRole_ko() (gas: 17808)
-MinterTest:test_addContent_InvalidSupply_ko() (gas: 62459)
-MinterTest:test_addContent_ok() (gas: 194533)
-MinterTest:test_benchmarkAddContent_ok() (gas: 695513)
-MinterTest:test_canBeDeployedAndInit_ok() (gas: 2267698)
-MinterTest:test_increaseSupply_InvalidRole_ko() (gas: 62404)
-MinterTest:test_increaseSupply_ok() (gas: 76003)
+MinterTest:test_addContent_InvalidRole_ko() (gas: 17786)
+MinterTest:test_addContent_InvalidSupply_ko() (gas: 62349)
+MinterTest:test_addContent_ok() (gas: 194511)
+MinterTest:test_benchmarkAddContent_ok() (gas: 695493)
+MinterTest:test_canBeDeployedAndInit_ok() (gas: 2376188)
+MinterTest:test_increaseSupply_InvalidRole_ko() (gas: 62426)
+MinterTest:test_increaseSupply_ok() (gas: 75960)
 MinterTest:test_initialize_InitTwice_ko() (gas: 22408)
-MinterTest:test_mintFraktionForUser_ok() (gas: 212912)
-MinterTest:test_mintFraktion_TooManyFraktion_ko() (gas: 216435)
-MinterTest:test_mintFraktion_ok() (gas: 210371)
-MinterTest:test_mintFreeFraktionForUser_ok() (gas: 60215)
-MinterTest:test_mintFreeFraktion_ExpectingOnlyFreeFraktion_ko() (gas: 40161)
-MinterTest:test_mintFreeFraktion_TooManyFraktion_ko() (gas: 66109)
+MinterTest:test_mintFraktionForUser_ok() (gas: 212890)
+MinterTest:test_mintFraktion_TooManyFraktion_ko() (gas: 216392)
+MinterTest:test_mintFraktion_noSig_NoApproval_ko() (gas: 116840)
+MinterTest:test_mintFraktion_noSig_TooManyFraktion_ko() (gas: 202076)
+MinterTest:test_mintFraktion_noSig_ok() (gas: 176284)
+MinterTest:test_mintFraktion_ok() (gas: 210327)
+MinterTest:test_mintFreeFraktionForUser_ok() (gas: 60226)
+MinterTest:test_mintFreeFraktion_ExpectingOnlyFreeFraktion_ko() (gas: 40051)
+MinterTest:test_mintFreeFraktion_TooManyFraktion_ko() (gas: 66043)
 MinterTest:test_mintFreeFraktion_ok() (gas: 62919)
 MultiVestingWalletsTest:test_canBeDeployedAndInit_ok() (gas: 2732546)
 MultiVestingWalletsTest:test_createVestBatch() (gas: 210765)

diff --git a/remappings.txt b/remappings.txt
@@ -1,5 +1,3 @@
-@frak/=contracts/
-
 @prb/test/=lib/prb-test/src/
 @forge-std/=lib/forge-std/src/
 

diff --git a/script/UpdateAll.s.sol b/script/UpdateAll.s.sol
@@ -3,16 +3,16 @@ pragma solidity 0.8.21;
 
 import "forge-std/Script.sol";
 import { UpgradeScript } from "./utils/UpgradeScript.s.sol";
-import { FrakToken } from "@frak/tokens/FrakToken.sol";
-import { FraktionTokens } from "@frak/fraktions/FraktionTokens.sol";
-import { MultiVestingWallets } from "@frak/wallets/MultiVestingWallets.sol";
-import { VestingWalletFactory } from "@frak/wallets/VestingWalletFactory.sol";
-import { FrakTreasuryWallet } from "@frak/wallets/FrakTreasuryWallet.sol";
-import { ReferralPool } from "@frak/reward/referralPool/ReferralPool.sol";
-import { Minter } from "@frak/minter/Minter.sol";
-import { ContentPool } from "@frak/reward/contentPool/ContentPool.sol";
-import { Rewarder } from "@frak/reward/Rewarder.sol";
-import { FrakRoles } from "@frak/roles/FrakRoles.sol";
+import { FrakToken } from "contracts/tokens/FrakToken.sol";
+import { FraktionTokens } from "contracts/fraktions/FraktionTokens.sol";
+import { MultiVestingWallets } from "contracts/wallets/MultiVestingWallets.sol";
+import { VestingWalletFactory } from "contracts/wallets/VestingWalletFactory.sol";
+import { FrakTreasuryWallet } from "contracts/wallets/FrakTreasuryWallet.sol";
+import { ReferralPool } from "contracts/reward/referralPool/ReferralPool.sol";
+import { Minter } from "contracts/minter/Minter.sol";
+import { ContentPool } from "contracts/reward/contentPool/ContentPool.sol";
+import { Rewarder } from "contracts/reward/Rewarder.sol";
+import { FrakRoles } from "contracts/roles/FrakRoles.sol";
 
 contract UpdateAllScript is UpgradeScript {
     function run() external {

diff --git a/script/UpdateToEip712Diamond.s.sol b/script/UpdateToEip712Diamond.s.sol
@@ -4,17 +4,17 @@ pragma solidity 0.8.21;
 import "forge-std/console.sol";
 import "forge-std/Script.sol";
 import { UpgradeScript } from "./utils/UpgradeScript.s.sol";
-import { FrakToken } from "@frak/tokens/FrakToken.sol";
-import { FraktionTokens } from "@frak/fraktions/FraktionTokens.sol";
-import { MultiVestingWallets } from "@frak/wallets/MultiVestingWallets.sol";
-import { VestingWalletFactory } from "@frak/wallets/VestingWalletFactory.sol";
-import { FrakTreasuryWallet } from "@frak/wallets/FrakTreasuryWallet.sol";
-import { ReferralPool } from "@frak/reward/referralPool/ReferralPool.sol";
-import { Minter } from "@frak/minter/Minter.sol";
-import { ContentPool } from "@frak/reward/contentPool/ContentPool.sol";
-import { Rewarder } from "@frak/reward/Rewarder.sol";
-import { FrakRoles } from "@frak/roles/FrakRoles.sol";
-import { WalletMigrator } from "@frak/wallets/WalletMigrator.sol";
+import { FrakToken } from "contracts/tokens/FrakToken.sol";
+import { FraktionTokens } from "contracts/fraktions/FraktionTokens.sol";
+import { MultiVestingWallets } from "contracts/wallets/MultiVestingWallets.sol";
+import { VestingWalletFactory } from "contracts/wallets/VestingWalletFactory.sol";
+import { FrakTreasuryWallet } from "contracts/wallets/FrakTreasuryWallet.sol";
+import { ReferralPool } from "contracts/reward/referralPool/ReferralPool.sol";
+import { Minter } from "contracts/minter/Minter.sol";
+import { ContentPool } from "contracts/reward/contentPool/ContentPool.sol";
+import { Rewarder } from "contracts/reward/Rewarder.sol";
+import { FrakRoles } from "contracts/roles/FrakRoles.sol";
+import { WalletMigrator } from "contracts/wallets/WalletMigrator.sol";
 
 contract UpdateToEip712Diamond is UpgradeScript {
     function run() external {

diff --git a/script/test/FakeReward.s.sol b/script/test/FakeReward.s.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.21;
 
 import "forge-std/Script.sol";
 import { UpgradeScript } from "../utils/UpgradeScript.s.sol";
-import { Rewarder } from "@frak/reward/Rewarder.sol";
-import { ContentId } from "@frak/libs/ContentId.sol";
+import { Rewarder } from "contracts/reward/Rewarder.sol";
+import { ContentId } from "contracts/libs/ContentId.sol";
 
 contract FakeRewardScript is UpgradeScript {
     function run() external {

diff --git a/script/utils/DeployAllScript.s.sol b/script/utils/DeployAllScript.s.sol
@@ -2,16 +2,16 @@
 pragma solidity 0.8.21;
 
 import { UpgradeScript } from "./UpgradeScript.s.sol";
-import { FrakToken } from "@frak/tokens/FrakToken.sol";
-import { FraktionTokens } from "@frak/fraktions/FraktionTokens.sol";
-import { MultiVestingWallets } from "@frak/wallets/MultiVestingWallets.sol";
-import { VestingWalletFactory } from "@frak/wallets/VestingWalletFactory.sol";
-import { FrakTreasuryWallet } from "@frak/wallets/FrakTreasuryWallet.sol";
-import { ReferralPool } from "@frak/reward/referralPool/ReferralPool.sol";
-import { Minter } from "@frak/minter/Minter.sol";
-import { ContentPool } from "@frak/reward/contentPool/ContentPool.sol";
-import { Rewarder } from "@frak/reward/Rewarder.sol";
-import { FrakRoles } from "@frak/roles/FrakRoles.sol";
+import { FrakToken } from "contracts/tokens/FrakToken.sol";
+import { FraktionTokens } from "contracts/fraktions/FraktionTokens.sol";
+import { MultiVestingWallets } from "contracts/wallets/MultiVestingWallets.sol";
+import { VestingWalletFactory } from "contracts/wallets/VestingWalletFactory.sol";
+import { FrakTreasuryWallet } from "contracts/wallets/FrakTreasuryWallet.sol";
+import { ReferralPool } from "contracts/reward/referralPool/ReferralPool.sol";
+import { Minter } from "contracts/minter/Minter.sol";
+import { ContentPool } from "contracts/reward/contentPool/ContentPool.sol";
+import { Rewarder } from "contracts/reward/Rewarder.sol";
+import { FrakRoles } from "contracts/roles/FrakRoles.sol";
 
 contract DeployAllScript is UpgradeScript {
     constructor() { }

diff --git a/test/FrakTest.sol b/test/FrakTest.sol
@@ -1,18 +1,18 @@
 // SPDX-License-Identifier: GNU GPLv3
 pragma solidity 0.8.21;
 
-import { ContentId } from "@frak/libs/ContentId.sol";
-import { FraktionId } from "@frak/libs/FraktionId.sol";
-import { FrakToken } from "@frak/tokens/FrakToken.sol";
-import { FraktionTokens } from "@frak/fraktions/FraktionTokens.sol";
-import { MultiVestingWallets } from "@frak/wallets/MultiVestingWallets.sol";
-import { VestingWalletFactory } from "@frak/wallets/VestingWalletFactory.sol";
-import { FrakTreasuryWallet } from "@frak/wallets/FrakTreasuryWallet.sol";
-import { ReferralPool } from "@frak/reward/referralPool/ReferralPool.sol";
-import { Minter } from "@frak/minter/Minter.sol";
-import { ContentPool } from "@frak/reward/contentPool/ContentPool.sol";
-import { Rewarder } from "@frak/reward/Rewarder.sol";
-import { FrakRoles } from "@frak/roles/FrakRoles.sol";
+import { ContentId } from "contracts/libs/ContentId.sol";
+import { FraktionId } from "contracts/libs/FraktionId.sol";
+import { FrakToken } from "contracts/tokens/FrakToken.sol";
+import { FraktionTokens } from "contracts/fraktions/FraktionTokens.sol";
+import { MultiVestingWallets } from "contracts/wallets/MultiVestingWallets.sol";
+import { VestingWalletFactory } from "contracts/wallets/VestingWalletFactory.sol";
+import { FrakTreasuryWallet } from "contracts/wallets/FrakTreasuryWallet.sol";
+import { ReferralPool } from "contracts/reward/referralPool/ReferralPool.sol";
+import { Minter } from "contracts/minter/Minter.sol";
+import { ContentPool } from "contracts/reward/contentPool/ContentPool.sol";
+import { Rewarder } from "contracts/reward/Rewarder.sol";
+import { FrakRoles } from "contracts/roles/FrakRoles.sol";
 import { PRBTest } from "@prb/test/PRBTest.sol";
 import { ERC1967Proxy } from "openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";