test: resolve .skip tests

lukso-network · Aug 14, 2023 · 64db7ac · 64db7ac
1 parent 614cec6
commit 64db7ac
Show file tree

Hide file tree

Showing 15 changed files with 660 additions and 816 deletions.
diff --git a/contracts/Mocks/Tokens/TokenReceiverWithLSP1.sol b/contracts/Mocks/Tokens/TokenReceiverWithLSP1.sol
@@ -15,8 +15,6 @@ import {
 import {_INTERFACEID_LSP1} from "../../LSP1UniversalReceiver/LSP1Constants.sol";
 
 contract TokenReceiverWithLSP1 is ERC165Storage, ILSP1UniversalReceiver {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     constructor() {
         _registerInterface(_INTERFACEID_LSP1);
     }
@@ -25,7 +23,7 @@ contract TokenReceiverWithLSP1 is ERC165Storage, ILSP1UniversalReceiver {
         bytes32 typeId,
         bytes memory data
     ) external payable override returns (bytes memory returnValue) {
-        emit UniversalReceiverCalled(typeId, data);
+        emit UniversalReceiver(msg.sender, msg.value, typeId, data, "");
 
         return "thanks for calling";
     }

diff --git a/contracts/Mocks/Tokens/TokenReceiverWithLSP1WithERC721Received.sol b/contracts/Mocks/Tokens/TokenReceiverWithLSP1WithERC721Received.sol
@@ -22,8 +22,6 @@ contract TokenReceiverWithLSP1WithERC721Received is
     ILSP1UniversalReceiver,
     ERC721Holder
 {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     constructor() {
         _registerInterface(_INTERFACEID_LSP1);
     }
@@ -36,7 +34,7 @@ contract TokenReceiverWithLSP1WithERC721Received is
         bytes32 typeId,
         bytes memory data
     ) external payable override returns (bytes memory returnValue) {
-        emit UniversalReceiverCalled(typeId, data);
+        emit UniversalReceiver(msg.sender, msg.value, typeId, data, "");
 
         return "thanks for calling";
     }

diff --git a/contracts/Mocks/Tokens/TokenReceiverWithLSP1WithERC721ReceivedInvalid.sol b/contracts/Mocks/Tokens/TokenReceiverWithLSP1WithERC721ReceivedInvalid.sol
@@ -22,8 +22,6 @@ contract TokenReceiverWithLSP1WithERC721ReceivedInvalid is
     ILSP1UniversalReceiver,
     ERC721Holder
 {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     constructor() {
         _registerInterface(_INTERFACEID_LSP1);
     }
@@ -36,7 +34,7 @@ contract TokenReceiverWithLSP1WithERC721ReceivedInvalid is
         bytes32 typeId,
         bytes memory data
     ) external payable override returns (bytes memory returnValue) {
-        emit UniversalReceiverCalled(typeId, data);
+        emit UniversalReceiver(msg.sender, msg.value, typeId, data, "");
 
         return "thanks for calling";
     }

diff --git a/contracts/Mocks/Tokens/TokenReceiverWithLSP1WithERC721ReceivedRevert.sol b/contracts/Mocks/Tokens/TokenReceiverWithLSP1WithERC721ReceivedRevert.sol
@@ -22,8 +22,6 @@ contract TokenReceiverWithLSP1WithERC721ReceivedRevert is
     ILSP1UniversalReceiver,
     ERC721Holder
 {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     constructor() {
         _registerInterface(_INTERFACEID_LSP1);
     }
@@ -36,7 +34,7 @@ contract TokenReceiverWithLSP1WithERC721ReceivedRevert is
         bytes32 typeId,
         bytes memory data
     ) external payable override returns (bytes memory returnValue) {
-        emit UniversalReceiverCalled(typeId, data);
+        emit UniversalReceiver(msg.sender, msg.value, typeId, data, "");
 
         return "thanks for calling";
     }

diff --git a/contracts/Mocks/Tokens/TokenReceiverWithoutLSP1WithERC721Received.sol b/contracts/Mocks/Tokens/TokenReceiverWithoutLSP1WithERC721Received.sol
@@ -10,8 +10,6 @@ import {
 import {_INTERFACEID_LSP1} from "../../LSP1UniversalReceiver/LSP1Constants.sol";
 
 contract TokenReceiverWithoutLSP1WithERC721Received is ERC721Holder {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     receive() external payable {}
 
     fallback() external payable {}

diff --git a/contracts/Mocks/Tokens/TokenReceiverWithoutLSP1WithERC721ReceivedInvalid.sol b/contracts/Mocks/Tokens/TokenReceiverWithoutLSP1WithERC721ReceivedInvalid.sol
@@ -10,8 +10,6 @@ import {
 import {_INTERFACEID_LSP1} from "../../LSP1UniversalReceiver/LSP1Constants.sol";
 
 contract TokenReceiverWithoutLSP1WithERC721ReceivedInvalid is ERC721Holder {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     receive() external payable {}
 
     fallback() external payable {}

diff --git a/contracts/Mocks/Tokens/TokenReceiverWithoutLSP1WithERC721ReceivedRevert.sol b/contracts/Mocks/Tokens/TokenReceiverWithoutLSP1WithERC721ReceivedRevert.sol
@@ -10,8 +10,6 @@ import {
 import {_INTERFACEID_LSP1} from "../../LSP1UniversalReceiver/LSP1Constants.sol";
 
 contract TokenReceiverWithoutLSP1WithERC721ReceivedRevert is ERC721Holder {
-    event UniversalReceiverCalled(bytes32 typeId, bytes data);
-
     receive() external payable {}
 
     fallback() external payable {}

diff --git a/tests/LSP20CallVerification/LSP6/LSP20WithLSP6.test.ts b/tests/LSP20CallVerification/LSP6/LSP20WithLSP6.test.ts
@@ -21,11 +21,6 @@ describe('LSP20 + LSP6 with constructor', () => {
     return { accounts, owner, universalProfile, keyManager, initialFunding };
   };
 
-  describe('when deploying the contract', () => {
-    // TODO: add tests to ensure LSP20 interface is registered.
-    // on LSP6 or LSP0?
-  });
-
   describe('when testing deployed contract', () => {
     shouldBehaveLikeLSP6(buildTestContext);
   });