Merge branch 'main' into fix/update-config

defi-wonderland · Nov 28, 2023 · d79252e · d79252e
2 parents bf2a062 + e88aeac
commit d79252e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/out/Greeter.sol/Greeter.json b/out/Greeter.sol/Greeter.json
@@ -338,12 +338,12 @@
         "license": "AGPL-3.0-only"
       },
       "solidity/contracts/Greeter.sol": {
-        "keccak256": "0x380ab9fd40c73e52202e49bc8ca254799aa135a5f7214c809f8a0cb65e8cc464",
+        "keccak256": "0x31ad12d0631313be7c0d2afe935047173e2b5ad191d1e22405c0532e63ee8d9a",
         "urls": [
-          "bzz-raw://1269c4308eb17da88bf144f70c38f81948a63176573a9274002d6b09a2da4605",
-          "dweb:/ipfs/QmRjVeDWNNvqhXWnePLbMcskw66KogmAP2iGYLmq3SxcAQ"
+          "bzz-raw://ef0aa8f2282ae495945ffa87d1bf8292d3fed9365b5b36207680851faae8d908",
+          "dweb:/ipfs/QmdygeqQcHQrkV5enr6qj1q6a8fDf4H2P3guHz1LgaGzYs"
         ],
-        "license": "UNLICENSED"
+        "license": "MIT"
       },
       "solidity/interfaces/IGreeter.sol": {
         "keccak256": "0x747827aecbe821fe3ed4b108eefa46393ee1277489d5273ef0496d51200af6c4",
@@ -1667,7 +1667,7 @@
         ]
       }
     ],
-    "license": "UNLICENSED"
+    "license": "MIT"
   },
   "id": 20
 }
diff --git a/solidity/contracts/Greeter.sol b/solidity/contracts/Greeter.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: MIT
 pragma solidity =0.8.19;
 
 import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';

diff --git a/solidity/scripts/Deploy.sol b/solidity/scripts/Deploy.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: MIT
 pragma solidity =0.8.19;
 
 import {Script} from 'forge-std/Script.sol';

diff --git a/solidity/test/e2e/Greeter.t.sol → solidity/test/integration/Greeter.t.sol b/solidity/test/e2e/Greeter.t.sol → solidity/test/integration/Greeter.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity =0.8.19;
 
-import {CommonE2EBase} from 'test/e2e/Common.sol';
+import {IntegrationBase} from 'test/integration/IntegrationBase.sol';
 
-contract E2EGreeter is CommonE2EBase {
+contract IntegrationGreeter is IntegrationBase {
   function test_Greet() public {
     uint256 _whaleBalance = _dai.balanceOf(_daiWhale);
 

diff --git a/solidity/test/e2e/Common.sol → ...dity/test/integration/IntegrationBase.sol b/solidity/test/e2e/Common.sol → ...dity/test/integration/IntegrationBase.sol
@@ -6,7 +6,7 @@ import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';
 
 import {Greeter, IGreeter} from 'contracts/Greeter.sol';
 
-contract CommonE2EBase is DSTestFull {
+contract IntegrationBase is DSTestFull {
   uint256 internal constant _FORK_BLOCK = 15_452_788;
 
   string internal _initialGreeting = 'hola';

diff --git a/solidity/test/unit/Greeter.t.sol b/solidity/test/unit/Greeter.t.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: MIT
 pragma solidity =0.8.19;
 
 import {IERC20} from 'isolmate/interfaces/tokens/IERC20.sol';