Skip to content

Commit 270cbe3

Browse files
Merge branch 'master' into development
Signed-off-by: kasperpawlowski <kasperpawlowski@gmail.com>
2 parents 6f55c8e + af4a193 commit 270cbe3

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

docs/swaps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Finally a `multicall` function allows chaining all of the above to execute compl
4545
The swaps can be performed in one of 3 modes:
4646
- exact input
4747

48-
In this mode, all of the provided input token is expected to be swapped for an unknown amount of the output token. The proceeds are expected to be sent to a vault, to be skimmed by the user, or back to the swapper contract. The latter option is useful when performing complex, multi-stage swaps, where the output token is accumulated in the swapper before being consumed at the end of the operation. Note that the available handler (`GenericHandler`) executes a payload encoded off-chain, so a lot of the parameters passed to the `swap` funtion will be ignored and only the amount of input token encoded in the payload will be swapped, even if the swapper holds more.
48+
In this mode, all of the provided input token is expected to be swapped for an unknown amount of the output token. The proceeds are expected to be sent to a vault, to be skimmed by the user, or back to the swapper contract. The latter option is useful when performing complex, multi-stage swaps, where the output token is accumulated in the swapper before being consumed at the end of the operation. Note that the available handler (`GenericHandler`) executes a payload encoded off-chain, so a lot of the parameters passed to the `swap` function will be ignored and only the amount of input token encoded in the payload will be swapped, even if the swapper holds more.
4949

5050
- exact output
5151

test/Governor/FactoryGovernor.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ contract FactoryGovernorTests is EVaultTestBase {
8282
vm.expectRevert("contract is in read-only mode");
8383
eTST.deposit(1e18, depositor);
8484

85-
// admin can roll back changes by installing previous imlpementation
85+
// admin can roll back changes by installing previous implementations
8686
vm.prank(admin);
8787
factoryGovernor.adminCall(address(factory), abi.encodeCall(factory.setImplementation, (oldImplementation)));
8888

test/HookTarget/HookTargetStakeDelegator.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ contract HookTargetStakeDelegatorTest is EVaultTestBase {
297297
assertEq(IRewardVault(rewardVault).getDelegateStake(user2, address(hookTargetStakeDelegator)), 1000);
298298
}
299299

300-
function test_HookTargetStakeDelegator_wihdraw_from_subaccount() public {
300+
function test_HookTargetStakeDelegator_withdraw_from_subaccount() public {
301301
address user2 = makeAddr("user2");
302302
address user2_subaccount1 = address(uint160(user2) ^ 0x1);
303303

test/SnapshotRegistry/SnapshotRegistry.unit.t.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ contract SnapshotRegistryTest is Test {
3434
}
3535

3636
/// @dev EVC address is stored and the owner is set to `msg.sender` in constructor.
37-
function testInitalize() public view {
37+
function testInitialize() public view {
3838
assertEq(registry.EVC(), address(evc));
3939
assertEq(registry.owner(), OWNER);
4040
}
@@ -83,7 +83,7 @@ contract SnapshotRegistryTest is Test {
8383
assertSingleElement(element, base, quote, timestamp1, true);
8484
}
8585

86-
/// @dev Many element can be added for the same base and quote. They can be queried by base and quote.
86+
/// @dev Many elements can be added for the same base and quote. They can be queried by base and quote.
8787
/// forge-config: default.fuzz.runs = 100
8888
function testAddMany(uint256 length, address base, address quote, uint256 timestamp0, uint256 timestamp1) public {
8989
length = bound(length, 2, 100);

0 commit comments

Comments
 (0)