Skip to content

Remove extra CollateralMock import #709

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove extra CollateralMock import #709

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions e2e/tests/omnibus-sepolia.toml/test/Common.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import {CannonDeploy} from "./CannonDeploy.sol";
import {ICoreProxy} from "deployments/sol/ICoreProxy.sol";
import {IAccountProxy} from "deployments/sol/IAccountProxy.sol";
import { IV4PerpsMarketProxy } from "deployments/sol/IV4PerpsMarketProxy.sol";
import { CollateralMock } from "@synthetixio/main/contracts/mocks/CollateralMock.sol";
import {IUSDProxy} from "deployments/sol/IUSDProxy.sol";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IUSDProxy is snxUSD contract so it would not be correct to use it as collateral.

since forge does not have mocks anymore, it is ok to use synthetixio/main/contracts/mocks/CollateralMock.sol for tests only


contract CommonTest is Test {
ICoreProxy internal CoreProxy;
IAccountProxy internal AccountProxy;
IV4PerpsMarketProxy internal PerpsMarketProxy;
CollateralMock internal mockUSDC;
IUSDProxy internal mockUSDC;
uint128 internal collateralId = 1;
uint256 internal fork;

Expand Down Expand Up @@ -43,7 +43,7 @@ contract CommonTest is Test {
CannonDeploy deployer = new CannonDeploy();
deployer.run();

mockUSDC = CollateralMock(PerpsMarketProxy.collateralToken());
mockUSDC = IUSDProxy(PerpsMarketProxy.collateralToken());
vm.label(address(mockUSDC), "CollateralMockUSDC");
}
}
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"devDependencies": {
"@pythnetwork/pyth-evm-js": "^1.82.0",
"@synthetixio/core-contracts": "^3.12.0",
"@synthetixio/main": "^3.12.3",
"@usecannon/builder": "2.23.0",
"@usecannon/cli": "2.23.0",
"abi-to-sol": "^0.8.0",
Expand Down
8 changes: 0 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,13 +1052,6 @@ __metadata:
languageName: node
linkType: hard

"@synthetixio/main@npm:^3.12.3":
version: 3.12.3
resolution: "@synthetixio/main@npm:3.12.3"
checksum: 10/a76f2cafec80981f348e1da284be8ae5abc4c44d26d2afcc854002aa662cd285fc8d42fab1a505c319c668552ac12661e84d794907c53c6b8e8516a03903f551
languageName: node
linkType: hard

"@taplo/core@npm:^0.1.0":
version: 0.1.1
resolution: "@taplo/core@npm:0.1.1"
Expand Down Expand Up @@ -5103,7 +5096,6 @@ __metadata:
dependencies:
"@pythnetwork/pyth-evm-js": "npm:^1.82.0"
"@synthetixio/core-contracts": "npm:^3.12.0"
"@synthetixio/main": "npm:^3.12.3"
"@usecannon/builder": "npm:2.23.0"
"@usecannon/cli": "npm:2.23.0"
abi-to-sol: "npm:^0.8.0"
Expand Down