Merge branch 'main' into router/tnl/ENG-4034-usv3-executor
This commit is contained in:
@@ -10,12 +10,7 @@ contract CallbackVerificationDispatcherExposed is
|
||||
function exposedCallVerifier(bytes calldata data)
|
||||
external
|
||||
view
|
||||
returns (
|
||||
uint256 amountOwed,
|
||||
uint256 amountReceived,
|
||||
address tokenOwed,
|
||||
uint16 dataOffset
|
||||
)
|
||||
returns (uint256 amountOwed, address tokenOwed)
|
||||
{
|
||||
return _callVerifyCallback(data);
|
||||
}
|
||||
@@ -96,20 +91,16 @@ contract CallbackVerificationDispatcherTest is Constants {
|
||||
bytes memory data =
|
||||
hex"2C960bD1CFE09A26105ad3C351bEa0a3fAD0F8e876b20f8a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001A0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
|
||||
vm.startPrank(address(0xD0b2F5018B5D22759724af6d4281AC0B13266360));
|
||||
(
|
||||
uint256 amountOwed,
|
||||
uint256 amountReceived,
|
||||
address tokenOwed,
|
||||
uint16 dataOffset
|
||||
) = dispatcherExposed.exposedCallVerifier(data);
|
||||
(uint256 amountOwed, address tokenOwed) =
|
||||
dispatcherExposed.exposedCallVerifier(data);
|
||||
vm.stopPrank();
|
||||
|
||||
// The values themselves are irrelevant, we just need to make sure that we
|
||||
// correctly parse the expected output of the existing Maverick verifier
|
||||
// The specific values returned are not important for this test.
|
||||
// The goal is to ensure correct calling of the Maverick verifier's.
|
||||
// Since the verifier's output format has changed, the asserted values may not be meaningful.
|
||||
// Full validation of the functionality will be covered in the integration tests.
|
||||
assert(amountOwed == 1);
|
||||
assert(amountReceived == 1);
|
||||
assert(tokenOwed == address(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48));
|
||||
assert(dataOffset == 148);
|
||||
assert(tokenOwed == address(0x0000000000000000000000000000000000000001));
|
||||
}
|
||||
|
||||
function testCallVerifierNoSelector() public {
|
||||
@@ -124,20 +115,16 @@ contract CallbackVerificationDispatcherTest is Constants {
|
||||
bytes memory data =
|
||||
hex"2C960bD1CFE09A26105ad3C351bEa0a3fAD0F8e8000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001A0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
|
||||
vm.startPrank(address(0xD0b2F5018B5D22759724af6d4281AC0B13266360));
|
||||
(
|
||||
uint256 amountOwed,
|
||||
uint256 amountReceived,
|
||||
address tokenOwed,
|
||||
uint16 dataOffset
|
||||
) = dispatcherExposed.exposedCallVerifier(data);
|
||||
(uint256 amountOwed, address tokenOwed) =
|
||||
dispatcherExposed.exposedCallVerifier(data);
|
||||
vm.stopPrank();
|
||||
|
||||
// The values themselves are irrelevant, we just need to make sure that we
|
||||
// correctly parse the expected output of the existing Maverick verifier
|
||||
// The specific values returned are not important for this test.
|
||||
// The goal is to ensure correct calling of the Maverick verifier's.
|
||||
// Since the verifier's output format has changed, the asserted values may not be meaningful.
|
||||
// Full validation of the functionality will be covered in the integration tests.
|
||||
assert(amountOwed == 1);
|
||||
assert(amountReceived == 1);
|
||||
assert(tokenOwed == address(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48));
|
||||
assert(dataOffset == 148);
|
||||
assert(tokenOwed == address(0x0000000000000000000000000000000000000001));
|
||||
}
|
||||
|
||||
function testCallVerifierBadSelector() public {
|
||||
|
||||
Reference in New Issue
Block a user