Merge branch 'storyprotocol:main' into add-namespace-storage

storyprotocol · Apr 9, 2024 · 6547e31 · 6547e31
2 parents c7a9135 + 10a898e
commit 6547e31
Show file tree

Hide file tree

Showing 46 changed files with 1,286 additions and 4,117 deletions.
diff --git a/.github/workflows/foundry_ci.yml b/.github/workflows/foundry_ci.yml
@@ -55,7 +55,7 @@ jobs:
 
       - name: Run Forge tests
         run: |
-          forge test -vvv --fork-url https://gateway.tenderly.co/public/sepolia --fork-block-number 5196000
+          forge test -vvv
         id: forge-test
 
       - name: Run solhint

diff --git a/contracts/lib/Errors.sol b/contracts/lib/Errors.sol
@@ -123,7 +123,6 @@ library Errors {
     error LicenseRegistry__CallerNotLicensingModule();
     error LicenseRegistry__ZeroLicensingModule();
     error LicensingModule__CallerNotLicenseRegistry();
-    error LicenseRegistry__RevokedLicense();
     /// @notice emitted when trying to transfer a license that is not transferable (by policy)
     error LicenseRegistry__NotTransferable();
     /// @notice emitted on constructor if dispute module is not set
@@ -184,7 +183,6 @@ library Errors {
     error LicensingModule__DerivativesCannotAddPolicy();
     error LicensingModule__IncompatibleRoyaltyPolicyAddress();
     error LicensingModule__IncompatibleRoyaltyPolicyDerivativeRevShare();
-    error LicensingModule__IncompatibleLicensorCommercialPolicy();
     error LicensingModule__IncompatibleLicensorRoyaltyDerivativeRevShare();
     error LicensingModule__DerivativeRevShareSumExceedsMaxRNFTSupply();
     error LicensingModule__MismatchBetweenRoyaltyPolicy();

diff --git a/foundry.toml b/foundry.toml
@@ -6,7 +6,7 @@ cache_path  = 'forge-cache'
 gas_reports = ["*"]
 optimizer = true
 optimizer_runs = 20000
-test = 'test/foundry/integration/e2e'
+test = 'test'
 solc = '0.8.23'
 fs_permissions = [{ access = 'read-write', path = './deploy-out' }, { access = 'read', path = './out' }]
 build_info = true