Merge branch 'master' into udapp-disconnect-fix

ethereum · Jan 10, 2025 · 1e87cae · 1e87cae
2 parents 89971a1 + 4b5b3b5
commit 1e87cae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/remix-ide-e2e/src/tests/solidityImport.test.ts b/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
@@ -158,7 +158,7 @@ const sources = [
     'Untitled5.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v2.3.0/contracts/token/ERC20/ERC20.sol"; contract test8 {}' }
   },
   {
-    'Untitled6.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol"; contract test10 {}' }
+    'Untitled6.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol"; contract test10 {}' }
   },
   {
     'Untitled7.sol': { content: 'import "https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol"; contract test11 {}' }

diff --git a/apps/remix-ide/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol b/apps/remix-ide/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol
diff --git a/libs/remix-simulator/test/events.ts b/libs/remix-simulator/test/events.ts
@@ -76,7 +76,7 @@ describe('Events', () => {
         toBlock: 2,
         topics: [['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']]
       })
-      // 0xdcd9c7fa0342f01013b is a topic from a event emitted by the other contract and should not be take into account.
+      // 0xdcd9c7fa0342f01013b is a topic from an event emitted by the other contract and should not be take into account.
       assert.equal(ownerLogs.length, 1, '5) ownerLogs length should be equal to 1')
     })
   })