Sitelet https://github.com/Vectorized/solady/commit/ea57c31eadfab11ec901cf9dc15d1d1145ff3c8a
Skip to content

Commit ea57c31

Browse files
authored
♻️ Refactor TestPlus (#387)
1 parent 3d32d5a commit ea57c31

32 files changed

Lines changed: 474 additions & 436 deletions

‎.gas-snapshot‎

Lines changed: 362 additions & 361 deletions
Large diffs are not rendered by default.

‎test/Base64.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55
import {Base64} from "../src/utils/Base64.sol";
66
import {LibString} from "../src/utils/LibString.sol";
77

8-
contract Base64Test is TestPlus {
8+
contract Base64Test is SoladyTest {
99
function testBase64EncodeEmptyString() public {
1010
_testBase64Encode("", "");
1111
}

‎test/CREATE3.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {MockAuthChild} from "./utils/mocks/MockAuthChild.sol";
77

88
import {CREATE3} from "../src/utils/CREATE3.sol";
99

10-
import "./utils/TestPlus.sol";
10+
import "./utils/SoladyTest.sol";
1111

12-
contract CREATE3Test is TestPlus {
12+
contract CREATE3Test is SoladyTest {
1313
function testDeployERC20() public {
1414
bytes32 salt = keccak256(bytes("A salt!"));
1515

‎test/DateTimeLib.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "../test/utils/TestPlus.sol";
4+
import "../test/utils/SoladyTest.sol";
55
import {DateTimeLib} from "../src/utils/DateTimeLib.sol";
66

7-
contract DateTimeLibTest is TestPlus {
7+
contract DateTimeLibTest is SoladyTest {
88
struct DateTime {
99
uint256 year;
1010
uint256 month;

‎test/DynamicBufferLib.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55
import {DynamicBufferLib} from "../src/utils/DynamicBufferLib.sol";
66

7-
contract DynamicBufferLibTest is TestPlus {
7+
contract DynamicBufferLibTest is SoladyTest {
88
using DynamicBufferLib for DynamicBufferLib.DynamicBuffer;
99

1010
function testDynamicBuffer(bytes[] memory inputs, uint256 randomness) public brutalizeMemory {

‎test/ECDSA.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55
import {ECDSA} from "../src/utils/ECDSA.sol";
66

7-
contract ECDSATest is TestPlus {
7+
contract ECDSATest is SoladyTest {
88
using ECDSA for bytes32;
99
using ECDSA for bytes;
1010

‎test/EIP712.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55
import {MockEIP712} from "./utils/mocks/MockEIP712.sol";
66
import {LibClone} from "../src/utils/LibClone.sol";
77

8-
contract EIP712Test is TestPlus {
8+
contract EIP712Test is SoladyTest {
99
MockEIP712 mock;
1010
MockEIP712 mockClone;
1111

‎test/ERC1155.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55

66
import {ERC1155, MockERC1155} from "./utils/mocks/MockERC1155.sol";
77

@@ -123,7 +123,7 @@ contract WrongReturnDataERC1155Recipient is ERC1155TokenReceiver {
123123

124124
contract NonERC1155Recipient {}
125125

126-
contract ERC1155Test is TestPlus, ERC1155TokenReceiver {
126+
contract ERC1155Test is SoladyTest, ERC1155TokenReceiver {
127127
MockERC1155 token;
128128

129129
event TransferSingle(

‎test/ERC1967Factory.t.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55
import {MockImplementation} from "./utils/mocks/MockImplementation.sol";
66
import {ERC1967Factory} from "../src/utils/ERC1967Factory.sol";
77
import {ERC1967FactoryConstants} from "../src/utils/ERC1967FactoryConstants.sol";
88

9-
contract ERC1967FactoryTest is TestPlus {
9+
contract ERC1967FactoryTest is SoladyTest {
1010
event AdminChanged(address indexed proxy, address indexed admin);
1111

1212
event Upgraded(address indexed proxy, address indexed implementation);

‎test/ERC20.t.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.4;
33

4-
import "./utils/TestPlus.sol";
4+
import "./utils/SoladyTest.sol";
55
import "./utils/InvariantTest.sol";
66

77
import {ERC20, MockERC20} from "./utils/mocks/MockERC20.sol";
88

9-
contract ERC20Test is TestPlus {
9+
contract ERC20Test is SoladyTest {
1010
MockERC20 token;
1111

1212
bytes32 constant PERMIT_TYPEHASH = keccak256(
@@ -486,7 +486,7 @@ contract ERC20Test is TestPlus {
486486
}
487487
}
488488

489-
contract ERC20Invariants is TestPlus, InvariantTest {
489+
contract ERC20Invariants is SoladyTest, InvariantTest {
490490
BalanceSum balanceSum;
491491
MockERC20 token;
492492

0 commit comments

Comments
 (0)