Skip to content

Commit

Permalink
chore: fix whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
0xdecr1pto committed Aug 24, 2023
1 parent 597de7f commit c87ca1e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/DssSpell.sol
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ contract DssSpellAction is DssAction {
function actions() public override {
// ---------- Auth ESM on the Vow ----------
// Forum: http://forum.makerdao.com/t/overlooked-vectors-for-post-shutdown-governance-attacks-postmortem/20696/5

DssExecLib.authorize(MCD_VOW, MCD_ESM);


// ---------- BlockTower Andromeda Input Conduit Chainlog Additions ----------
// Forum: http://forum.makerdao.com/t/overlooked-vectors-for-post-shutdown-governance-attacks-postmortem/20696/5

// OPERATOR permission on RWA015_A_INPUT_CONDUIT_URN_GUSD
RwaInputConduitLike(RWA015_A_INPUT_CONDUIT_URN_GUSD).mate(RWA015_A_OPERATOR);
// Set "quitTo" address for RWA015_A_INPUT_CONDUIT_URN_GUSD
Expand Down Expand Up @@ -148,11 +148,11 @@ contract DssSpellAction is DssAction {
// ---------- Launch Project MKR Transfer ----------
// Discussion: https://github.com/makerdao/spells-mainnet/issues/354
// NOTE: Skip for goerli


// ---------- Yank GovAlpha Budget Streams ----------
// Forum: http://forum.makerdao.com/t/overlooked-vectors-for-post-shutdown-governance-attacks-postmortem/20696/5

DssVestLike(MCD_VEST_DAI).yank(17);
DssVestLike(MCD_VEST_MKR_TREASURY).yank(34);

Expand Down
13 changes: 6 additions & 7 deletions src/DssSpell.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -944,25 +944,24 @@ contract DssSpellTest is DssSpellTestBase {
GemAbstract gusd = GemAbstract(rwa015AInputConduitUrnGUSD.gem());
GemAbstract pax = GemAbstract(rwa015AInputConduitUrnPAX.gem());

// Note: This is an exception because of exceeding the `action` size in the spell. Main pattern is to have this checks in the spell itself
function testRWA015_CONTRACT_DEPLOYMENT_SETUP() public {
assertEq(rwa015AInputConduitUrnGUSD.psm(), addr.addr("MCD_PSM_GUSD_A"), "input-conduit-gusd-urn-psm-not-match");
assertEq(rwa015AInputConduitUrnGUSD.to(), address(rwa015AUrn), "input-conduit-urn-gusd-to-not-match");
assertEq(rwa015AInputConduitUrnGUSD.to(), rwa015AUrn, "input-conduit-urn-gusd-to-not-match");
assertEq(rwa015AInputConduitUrnGUSD.dai(), addr.addr("MCD_DAI"), "input-conduit-urn-gusd-dai-not-match");
assertEq(rwa015AInputConduitUrnGUSD.gem(), addr.addr("GUSD"), "input-conduit-urn-gusd-gem-not-match");

assertEq(rwa015AInputConduitJarGUSD.psm(), addr.addr("MCD_PSM_GUSD_A"), "input-conduit-jar-gusd-psm-not-match");
assertEq(rwa015AInputConduitJarGUSD.to(), address(rwa015AJar), "input-conduit-jar-gusd-to-not-match");
assertEq(rwa015AInputConduitJarGUSD.to(), rwa015AJar, "input-conduit-jar-gusd-to-not-match");
assertEq(rwa015AInputConduitJarGUSD.dai(), addr.addr("MCD_DAI"), "input-conduit-jar-gusd-dai-not-match");
assertEq(rwa015AInputConduitJarGUSD.gem(), addr.addr("GUSD"), "input-conduit-jar-gusd-gem-not-match");

assertEq(rwa015AInputConduitUrnPAX.psm(), addr.addr("MCD_PSM_PAX_A"), "input-conduit-urn-pax-psm-not-match");
assertEq(rwa015AInputConduitUrnPAX.to(), address(rwa015AUrn), "input-conduit-urn-pax-to-not-match");
assertEq(rwa015AInputConduitUrnPAX.to(), rwa015AUrn, "input-conduit-urn-pax-to-not-match");
assertEq(rwa015AInputConduitUrnPAX.dai(), addr.addr("MCD_DAI"), "input-conduit-urn-pax-dai-not-match");
assertEq(rwa015AInputConduitUrnPAX.gem(), addr.addr("PAX"), "input-conduit-urn-pax-gem-not-match");

assertEq(rwa015AInputConduitJarPAX.psm(), addr.addr("MCD_PSM_PAX_A"), "input-conduit-jar-pax-psm-not-match");
assertEq(rwa015AInputConduitJarPAX.to(), address(rwa015AJar), "input-conduit-jar-pax-to-not-match");
assertEq(rwa015AInputConduitJarPAX.to(), rwa015AJar, "input-conduit-jar-pax-to-not-match");
assertEq(rwa015AInputConduitJarPAX.dai(), addr.addr("MCD_DAI"), "input-conduit-jar-pax-dai-not-match");
assertEq(rwa015AInputConduitJarPAX.gem(), addr.addr("PAX"), "input-conduit-jar-pax-gem-not-match");
}
Expand Down Expand Up @@ -1012,8 +1011,8 @@ contract DssSpellTest is DssSpellTestBase {
_scheduleWaitAndCast(address(spell));
assertTrue(spell.done());

uint256 gusdAmt = 1000 * 10**2;
uint256 paxAmt = 1000 * 10**18;
uint256 gusdAmt = 1000 * 10**2;
uint256 paxAmt = 1000 * 10**18;
uint256 urnBalanceBefore = dai.balanceOf(rwa015AUrn);
uint256 jarBalanceBefore = dai.balanceOf(rwa015AJar);

Expand Down

0 comments on commit c87ca1e

Please sign in to comment.