Skip to content

Commit

Permalink
fix: fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
marktoda committed Apr 5, 2024
1 parent 396eccd commit f7313c9
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 34 deletions.
28 changes: 14 additions & 14 deletions test/base/BaseReactor.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
ResolvedOrder memory order = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(deadline).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand Down Expand Up @@ -274,7 +274,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[0] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
0
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand All @@ -284,7 +284,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[1] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
input: InputToken(tokenIn, 2 * inputAmount, 2 * inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), 2 * outputAmount, swapper),
sig: hex"00",
Expand Down Expand Up @@ -322,7 +322,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[0] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
0
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(NATIVE, outputAmount, swapper),
sig: hex"00",
Expand All @@ -332,7 +332,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[1] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
input: InputToken(tokenIn, 2 * inputAmount, 2 * inputAmount),
outputs: OutputsBuilder.single(NATIVE, 2 * outputAmount, swapper),
sig: hex"00",
Expand Down Expand Up @@ -374,7 +374,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[0] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
0
),
),
input: InputToken(tokenIn, ONE, ONE),
outputs: OutputsBuilder.multiple(address(tokenOut), output1, swapper),
sig: hex"00",
Expand All @@ -384,7 +384,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[1] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
input: InputToken(tokenIn, ONE * 2, ONE * 2),
outputs: OutputsBuilder.multiple(address(tokenOut), output2, swapper),
sig: hex"00",
Expand Down Expand Up @@ -431,7 +431,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[0] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
0
),
),
input: InputToken(tokenIn, ONE, ONE),
outputs: outputs1,
sig: hex"00",
Expand All @@ -441,7 +441,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
orders[1] = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
input: InputToken(tokenIn, ONE * 2, ONE * 2),
outputs: outputs2,
sig: hex"00",
Expand Down Expand Up @@ -523,7 +523,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
ResolvedOrder memory order = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
123
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand Down Expand Up @@ -691,7 +691,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
ResolvedOrder memory order = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(deadline).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand Down Expand Up @@ -733,7 +733,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
ResolvedOrder memory order = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(deadline).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand Down Expand Up @@ -763,7 +763,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
ResolvedOrder memory order = ResolvedOrder({
info: OrderInfoBuilder.init(orderReactor).withSwapper(swapper).withDeadline(deadline).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand All @@ -787,7 +787,7 @@ abstract contract BaseReactorTest is GasSnapshot, ReactorEvents, Test, DeployPer
ResolvedOrder memory order = ResolvedOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(deadline).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, inputAmount, inputAmount),
outputs: OutputsBuilder.single(address(tokenOut), outputAmount, swapper),
sig: hex"00",
Expand Down
4 changes: 2 additions & 2 deletions test/executors/SwapRouter02Executor.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ contract SwapRouter02ExecutorTest is Test, PermitSignature, GasSnapshot, DeployP
DutchOrder memory order2 = DutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1234
),
),
decayStartTime: block.timestamp - 100,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, ONE, ONE),
Expand Down Expand Up @@ -270,7 +270,7 @@ contract SwapRouter02ExecutorTest is Test, PermitSignature, GasSnapshot, DeployP
DutchOrder memory order2 = DutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount * 3, inputAmount * 3),
Expand Down
4 changes: 2 additions & 2 deletions test/reactors/BaseDutchOrderReactor.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ abstract contract BaseDutchOrderReactorTest is PermitSignature, DeployPermit2, B
input: DutchInput(tokenIn, 0, 0),
outputs: OutputsBuilder.multipleDutch(
tokenOut, Solarray.uint256s(1000, 10000, 2000), Solarray.uint256s(900, 9000, 1000), address(0)
)
)
})
);
ResolvedOrder memory resolvedOrder = quoter.quote(order.order, order.sig);
Expand Down Expand Up @@ -363,7 +363,7 @@ abstract contract BaseDutchOrderReactorTest is PermitSignature, DeployPermit2, B
input: DutchInput(tokenIn, 100, 110),
outputs: OutputsBuilder.multipleDutch(
tokenOut, Solarray.uint256s(1000, 1000), Solarray.uint256s(1000, 900), address(0)
)
)
})
);
vm.expectRevert(DutchOrderReactor.InputAndOutputDecay.selector);
Expand Down
8 changes: 4 additions & 4 deletions test/reactors/DutchOrderReactor.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ contract DutchOrderReactorTest is PermitSignature, DeployPermit2, BaseDutchOrder
orders[1] = DutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, 2 ether, 2 ether),
Expand Down Expand Up @@ -166,7 +166,7 @@ contract DutchOrderReactorTest is PermitSignature, DeployPermit2, BaseDutchOrder
orders[1] = DutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount * 2, inputAmount * 2),
Expand Down Expand Up @@ -199,7 +199,7 @@ contract DutchOrderReactorTest is PermitSignature, DeployPermit2, BaseDutchOrder
orders[1] = DutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount * 2, inputAmount * 2),
Expand Down Expand Up @@ -233,7 +233,7 @@ contract DutchOrderReactorTest is PermitSignature, DeployPermit2, BaseDutchOrder
orders[1] = DutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount, inputAmount),
Expand Down
8 changes: 4 additions & 4 deletions test/reactors/ExclusiveDutchOrderReactor.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ contract ExclusiveDutchOrderReactorTest is PermitSignature, DeployPermit2, BaseD
orders[1] = ExclusiveDutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
exclusiveFiller: address(0),
Expand Down Expand Up @@ -279,7 +279,7 @@ contract ExclusiveDutchOrderReactorTest is PermitSignature, DeployPermit2, BaseD
orders[1] = ExclusiveDutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
exclusiveFiller: address(0),
Expand Down Expand Up @@ -316,7 +316,7 @@ contract ExclusiveDutchOrderReactorTest is PermitSignature, DeployPermit2, BaseD
orders[1] = ExclusiveDutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
exclusiveFiller: address(0),
Expand Down Expand Up @@ -354,7 +354,7 @@ contract ExclusiveDutchOrderReactorTest is PermitSignature, DeployPermit2, BaseD
orders[1] = ExclusiveDutchOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100).withNonce(
1
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
exclusiveFiller: address(0),
Expand Down
8 changes: 4 additions & 4 deletions test/reactors/LimitOrderReactor.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ contract LimitOrderReactorTest is PermitSignature, DeployPermit2, BaseReactorTes
LimitOrder memory order = LimitOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(address(swapper)).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, ONE, ONE),
outputs: OutputsBuilder.single(address(tokenOut), ONE, address(swapper))
});
Expand Down Expand Up @@ -86,7 +86,7 @@ contract LimitOrderReactorTest is PermitSignature, DeployPermit2, BaseReactorTes
LimitOrder memory order = LimitOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(address(swapper)).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, ONE, ONE),
outputs: OutputsBuilder.single(address(tokenOut), ONE * 2, address(swapper))
});
Expand All @@ -106,7 +106,7 @@ contract LimitOrderReactorTest is PermitSignature, DeployPermit2, BaseReactorTes
LimitOrder memory order = LimitOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(address(swapper)).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, ONE, ONE),
outputs: OutputsBuilder.multiple(address(tokenOut), amounts, address(swapper))
});
Expand Down Expand Up @@ -134,7 +134,7 @@ contract LimitOrderReactorTest is PermitSignature, DeployPermit2, BaseReactorTes
LimitOrder memory order = LimitOrder({
info: OrderInfoBuilder.init(address(reactor)).withSwapper(address(swapper)).withValidationContract(
additionalValidationContract
),
),
input: InputToken(tokenIn, ONE, ONE),
outputs: OutputsBuilder.single(address(tokenOut), ONE, address(swapper))
});
Expand Down
8 changes: 4 additions & 4 deletions test/validation-contracts/ExclusiveFillerValidation.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ contract ExclusiveFillerValidationTest is Test, PermitSignature, GasSnapshot, De
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100)
.withValidationContract(exclusiveFillerValidation).withValidationData(
abi.encode(address(fillContract), block.timestamp + 50)
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount, inputAmount),
Expand Down Expand Up @@ -84,7 +84,7 @@ contract ExclusiveFillerValidationTest is Test, PermitSignature, GasSnapshot, De
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100)
.withValidationContract(exclusiveFillerValidation).withValidationData(
abi.encode(address(0x1234), block.timestamp + 50)
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount, inputAmount),
Expand Down Expand Up @@ -112,7 +112,7 @@ contract ExclusiveFillerValidationTest is Test, PermitSignature, GasSnapshot, De
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100)
.withValidationContract(exclusiveFillerValidation).withValidationData(
abi.encode(address(0x1234), block.timestamp - 50)
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount, inputAmount),
Expand All @@ -137,7 +137,7 @@ contract ExclusiveFillerValidationTest is Test, PermitSignature, GasSnapshot, De
info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper).withDeadline(block.timestamp + 100)
.withValidationContract(exclusiveFillerValidation).withValidationData(
abi.encode(address(0x1234), block.timestamp)
),
),
decayStartTime: block.timestamp,
decayEndTime: block.timestamp + 100,
input: DutchInput(tokenIn, inputAmount, inputAmount),
Expand Down

0 comments on commit f7313c9

Please sign in to comment.