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

chore: fix forge formatting #730

Merged
merged 1 commit into from
Nov 28, 2023
Merged

chore: fix forge formatting #730

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
14 changes: 5 additions & 9 deletions script/DeployDeterministicCore.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,11 @@ contract DeployDeterministicCore is BaseScript {
)
{
bytes32 salt = bytes32(abi.encodePacked(create2Salt));
comptroller = new SablierV2Comptroller{ salt: salt}(initialAdmin);
nftDescriptor = new SablierV2NFTDescriptor{ salt: salt}();
comptroller = new SablierV2Comptroller{ salt: salt }(initialAdmin);
nftDescriptor = new SablierV2NFTDescriptor{ salt: salt }();
// forgefmt: disable-next-line
lockupDynamic = new SablierV2LockupDynamic{ salt: salt}(
initialAdmin,
comptroller,
nftDescriptor,
maxSegmentCount
);
lockupLinear = new SablierV2LockupLinear{ salt: salt}(initialAdmin, comptroller, nftDescriptor);
lockupDynamic =
new SablierV2LockupDynamic{ salt: salt }(initialAdmin, comptroller, nftDescriptor, maxSegmentCount);
lockupLinear = new SablierV2LockupLinear{ salt: salt }(initialAdmin, comptroller, nftDescriptor);
}
}
12 changes: 4 additions & 8 deletions script/DeployDeterministicCore2.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ contract DeployDeterministicCore2 is BaseScript {
)
{
bytes32 salt = bytes32(abi.encodePacked(create2Salt));
comptroller = new SablierV2Comptroller{ salt: salt}(initialAdmin);
comptroller = new SablierV2Comptroller{ salt: salt }(initialAdmin);
// forgefmt: disable-next-line
lockupDynamic = new SablierV2LockupDynamic{ salt: salt}(
initialAdmin,
comptroller,
nftDescriptor,
maxSegmentCount
);
lockupLinear = new SablierV2LockupLinear{ salt: salt}(initialAdmin, comptroller, nftDescriptor);
lockupDynamic =
new SablierV2LockupDynamic{ salt: salt }(initialAdmin, comptroller, nftDescriptor, maxSegmentCount);
lockupLinear = new SablierV2LockupLinear{ salt: salt }(initialAdmin, comptroller, nftDescriptor);
}
}
5 changes: 1 addition & 4 deletions script/DeployDeterministicLockupDynamic.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ contract DeployDeterministicLockupDynamic is BaseScript {
returns (SablierV2LockupDynamic lockupDynamic)
{
lockupDynamic = new SablierV2LockupDynamic{ salt: bytes32(abi.encodePacked(create2Salt)) }(
initialAdmin,
initialComptroller,
initialNFTDescriptor,
maxSegmentCount
initialAdmin, initialComptroller, initialNFTDescriptor, maxSegmentCount
);
}
}
4 changes: 1 addition & 3 deletions script/DeployDeterministicLockupLinear.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ contract DeployDeterministicLockupLinear is BaseScript {
returns (SablierV2LockupLinear lockupLinear)
{
lockupLinear = new SablierV2LockupLinear{ salt: bytes32(abi.encodePacked(create2Salt)) }(
initialAdmin,
initialComptroller,
initialNFTDescriptor
initialAdmin, initialComptroller, initialNFTDescriptor
);
}
}
8 changes: 2 additions & 6 deletions script/DeployLockupDynamic.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ contract DeployLockupDynamic is BaseScript {
broadcast
returns (SablierV2LockupDynamic lockupDynamic)
{
lockupDynamic = new SablierV2LockupDynamic(
initialAdmin,
initialComptroller,
initialNFTDescriptor,
maxSegmentCount
);
lockupDynamic =
new SablierV2LockupDynamic(initialAdmin, initialComptroller, initialNFTDescriptor, maxSegmentCount);
}
}
6 changes: 4 additions & 2 deletions test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ contract SafeAssetSymbol_Integration_Concrete_Test is NFTDescriptor_Integration_
}

function test_SafeAssetSymbol_LongSymbol() external whenERC20Contract givenSymbolString {
ERC20 asset =
new ERC20({ name_: "Token", symbol_: "This symbol is has more than 30 characters and it should be ignored" });
ERC20 asset = new ERC20({
name_: "Token",
symbol_: "This symbol is has more than 30 characters and it should be ignored"
});
string memory actualSymbol = nftDescriptorMock.safeAssetSymbol_(address(asset));
string memory expectedSymbol = "Long Symbol";
assertEq(actualSymbol, expectedSymbol, "symbol");
Expand Down