feat: hardcode callback and swap selection in dispatcher
This commit is contained in:
@@ -7,11 +7,10 @@ import "./TychoRouterTestSetup.sol";
|
||||
contract DispatcherExposed is Dispatcher {
|
||||
function exposedCallExecutor(
|
||||
address executor,
|
||||
bytes4 selector,
|
||||
uint256 amount,
|
||||
bytes calldata data
|
||||
) external returns (uint256 calculatedAmount) {
|
||||
return _callExecutor(executor, selector, amount, data);
|
||||
return _callExecutor(executor, amount, data);
|
||||
}
|
||||
|
||||
function exposedSetExecutor(address target) external {
|
||||
@@ -83,10 +82,7 @@ contract DispatcherTest is Constants {
|
||||
hex"5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72fc8c39af7983bf329086de522229a7be5fc4e41cc51c72848c68a965f66fa7a88855f9f7784502a7f2606beffe61000613d6a25b5bfef4cd7652aa94777d4a46b39f2e206411280a12c9344b769ff1066c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000d02ab486cedc0000000000000000000000000000000000000000000000000000000000082ec8ad1b0000000000000000000000000000000000000000000000000000000066d7b65800000000000000000000000000000000000000000000000000000191ba9f843c125000064000640000d52de09955f0ffffffffffffff00225c389e595fe9000001fcc910754b349f821e4bb5d8444822a63920be943aba6f1b31ee14ef0fc6840b6d28d604e04a78834b668dba24a6c082ffb901e4fffa9600649e8d991af593c81c";
|
||||
uint256 givenAmount = 15 ether;
|
||||
uint256 amount = dispatcherExposed.exposedCallExecutor(
|
||||
0xe592557AB9F4A75D992283fD6066312FF013ba3d,
|
||||
IExecutor.swap.selector,
|
||||
givenAmount,
|
||||
data
|
||||
0xe592557AB9F4A75D992283fD6066312FF013ba3d, givenAmount, data
|
||||
);
|
||||
assert(amount == 35144641819);
|
||||
}
|
||||
@@ -110,10 +106,7 @@ contract DispatcherTest is Constants {
|
||||
hex"5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72fc8c39af7983bf329086de522229a7be5fc4e41cc51c72848c68a965f66fa7a88855f9f7784502a7f2606beffe61000613d6a25b5bfef4cd7652aa94777d4a46b39f2e206411280a12c9344b769ff1066c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000d02ab486cedc0000000000000000000000000000000000000000000000000000000000082ec8ad1b0000000000000000000000000000000000000000000000000000000066d7b65800000000000000000000000000000000000000000000000000000191ba9f843c125000064000640000d52de09955f0ffffffffffffff00225c389e595fe9000001fcc910754b349f821e4bb5d8444822a63920be943aba6f1b31ee14ef0fc6840b6d28d604e04a78834b668dba24a6c082ffb901e4fffa9600649e8d991af593c81c";
|
||||
uint256 givenAmount = 15 ether;
|
||||
uint256 amount = dispatcherExposed.exposedCallExecutor(
|
||||
0xe592557AB9F4A75D992283fD6066312FF013ba3d,
|
||||
bytes4(0),
|
||||
givenAmount,
|
||||
data
|
||||
0xe592557AB9F4A75D992283fD6066312FF013ba3d, givenAmount, data
|
||||
);
|
||||
assert(amount == 35144641819);
|
||||
}
|
||||
@@ -127,10 +120,7 @@ contract DispatcherTest is Constants {
|
||||
hex"5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72fc8c39af7983bf329086de522229a7be5fc4e41cc51c72848c68a965f66fa7a88855f9f7784502a7f2606beffe61000613d6a25b5bfef4cd7652aa94777d4a46b39f2e206411280a12c9344b769ff1066c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000d02ab486cedc0000000000000000000000000000000000000000000000000000000000082ec8ad1b0000000000000000000000000000000000000000000000000000000066d7b65800000000000000000000000000000000000000000000000000000191ba9f843c125000064000640000d52de09955f0ffffffffffffff00225c389e595fe9000001fcc910754b349f821e4bb5d8444822a63920be943aba6f1b31ee14ef0fc6840b6d28d604e04a78834b668dba24a6c082ffb901e4fffa9600649e8d991af593";
|
||||
vm.expectRevert();
|
||||
dispatcherExposed.exposedCallExecutor(
|
||||
0xe592557AB9F4A75D992283fD6066312FF013ba3d,
|
||||
IExecutor.swap.selector,
|
||||
0,
|
||||
data
|
||||
0xe592557AB9F4A75D992283fD6066312FF013ba3d, 0, data
|
||||
);
|
||||
}
|
||||
|
||||
@@ -138,7 +128,7 @@ contract DispatcherTest is Constants {
|
||||
bytes memory data = hex"aabbccdd1111111111111111";
|
||||
vm.expectRevert();
|
||||
dispatcherExposed.exposedCallExecutor(
|
||||
0x5d622C9053b8FFB1B3465495C8a42E603632bA70, bytes4(0), 0, data
|
||||
0x5d622C9053b8FFB1B3465495C8a42E603632bA70, 0, data
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user