Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix failing tests #33

Merged
merged 1 commit into from Oct 6, 2023
Merged

Fix failing tests #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions .env
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions .env.example
View file
Open in desktop
@@ -0,0 +1,19 @@
ETH_NODE_URI_MAINNET=https://eth-mainnet.alchemyapi.io/v2/noz9bn6oi0lveG8xkoFjuwdWKd1w4ZjW
ETH_NODE_URI_OPTIMISM=https://rpc.ankr.com/optimism
ETH_NODE_URI_ARBITRUM=https://arb-mainnet-public.unifra.io
ETH_NODE_URI_POLYGON=https://polygon.llamarpc.com
ETH_NODE_URI_BSC=https://bsc.meowrpc.com
ETH_NODE_URI_BASE=https://1rpc.io/base

SKIP_DOCGEN=true

# this private key is from Anvil first default user
PRIVATE_KEY=

ETHERSCAN_MAINNET_KEY=
POLYGONSCAN_API_KEY=
ARBISCAN_API_KEY=
OPTIMISTIC_API_KEY=
BSCSCAN_API_KEY=
SNOWTRACE_API_KEY=
BASE_API_KEY=
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -12,3 +12,5 @@ yalc.lock
contractsInfo.json
deployments/hardhat
deployments/localhost

.env
32 changes: 16 additions & 16 deletions test/compound/WidoCollateralSwap.t.sol
View file
Open in desktop
Expand Up @@ -78,14 +78,6 @@ contract WidoCollateralSwapTest is MainnetForkTest {
// track the initial principal
int104 initialPrincipal = _userPrincipal(user1);

// define expected Event
vm.expectEmit(true, true, false, false);
emit SupplyCollateral(address(_collateralSwap), user1, address(0), 0);

// define expected Event
vm.expectEmit(true, true, false, false);
emit WithdrawCollateral(user1, address(_collateralSwap), address(0), 0);

// generate allow signature
uint256 nonce = cometUsdc.userNonce(user1);
LibCollateralSwap.Signature memory allowSignature = _sign(
Expand Down Expand Up @@ -116,6 +108,14 @@ contract WidoCollateralSwapTest is MainnetForkTest {
_generateWidoRouterCalldata(existingCollateral, finalCollateral, finalCollateral.amount, address(_collateralSwap))
);

// define expected Event
vm.expectEmit(true, true, false, false);
emit SupplyCollateral(address(_collateralSwap), user1, address(0), 0);

// define expected Event
vm.expectEmit(true, true, false, false);
emit WithdrawCollateral(user1, address(_collateralSwap), address(0), 0);

/** Act */

_collateralSwap.swapCollateral(
Expand Down Expand Up @@ -156,14 +156,6 @@ contract WidoCollateralSwapTest is MainnetForkTest {
// track the initial principal
int104 initialPrincipal = _userPrincipal(user1);

// define expected Event
vm.expectEmit(true, true, false, false);
emit SupplyCollateral(address(_collateralSwap), user1, address(0), 0);

// define expected Event
vm.expectEmit(true, true, false, false);
emit WithdrawCollateral(user1, address(_collateralSwap), address(0), 0);

// generate allow signature
uint256 nonce = cometUsdc.userNonce(user1);
LibCollateralSwap.Signature memory allowSignature = _sign(
Expand Down Expand Up @@ -196,6 +188,14 @@ contract WidoCollateralSwapTest is MainnetForkTest {
address(widoTokenManager),
_generateWidoRouterCalldata(existingCollateral, finalCollateral, _outputAmount, address(_collateralSwap))
);

// define expected Event
vm.expectEmit(true, true, false, false);
emit SupplyCollateral(address(_collateralSwap), user1, address(0), 0);

// define expected Event
vm.expectEmit(true, true, false, false);
emit WithdrawCollateral(user1, address(_collateralSwap), address(0), 0);

/** Act */

Expand Down