Skip to content

Consistent format for solidity code #2459

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

Merged
merged 3 commits into from
Jun 5, 2021
Merged

Consistent format for solidity code #2459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af12cd2
consistent formatting of solidity code
Jun 5, 2021
e069284
more
Jun 5, 2021
82d74eb
more
Jun 5, 2021
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
4 changes: 2 additions & 2 deletions packages/loopring_v3/contracts/amm/AmplifiedAmmController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ contract AmplifiedAmmController is IAmmController, Claimable
uint public constant MIN_CURVE_CHANGE_DELAY = 7 days;
uint public constant CURVE_CHANGE_AUTH_WINDOW = 7 days;

mapping(address => uint) public amplificationFactors;
mapping(address => uint) public curveChangeAuthorization;
mapping (address => uint) public amplificationFactors;
mapping (address => uint) public curveChangeAuthorization;

function getInitialVirtualBalances(
uint96[] memory joinAmounts
Expand Down
6 changes: 3 additions & 3 deletions packages/loopring_v3/contracts/amm/libamm/AmmData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ library AmmData
string symbol;
uint _totalSupply;

mapping(address => uint) balanceOf;
mapping(address => mapping(address => uint)) allowance;
mapping(address => uint) nonces;
mapping (address => uint) balanceOf;
mapping (address => mapping (address => uint)) allowance;
mapping (address => uint) nonces;

// AMM pool state variables
IAmmSharedConfig sharedConfig;
Expand Down
4 changes: 2 additions & 2 deletions packages/loopring_v3/contracts/aux/access/DelayedTransaction.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ abstract contract DelayedTransaction is IDelayedTransaction, ReentrancyGuard
{
// First cache all transactions ids of the transactions we will remove
uint[] memory transactionIds = new uint[](pendingTransactions.length);
for(uint i = 0; i < pendingTransactions.length; i++) {
for (uint i = 0; i < pendingTransactions.length; i++) {
transactionIds[i] = pendingTransactions[i].id;
}
// Now remove all delayed transactions
for(uint i = 0; i < transactionIds.length; i++) {
for (uint i = 0; i < transactionIds.length; i++) {
cancelTransactionInternal(transactionIds[i]);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/loopring_v3/contracts/aux/access/SelectorBasedAccessManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract SelectorBasedAccessManager is Claimable
);

address public immutable target;
mapping(address => mapping(bytes4 => bool)) public permissions;
mapping (address => mapping (bytes4 => bool)) public permissions;

modifier withAccess(bytes4 selector)
{
Expand Down
8 changes: 4 additions & 4 deletions packages/loopring_v3/contracts/aux/bridge/BatchDepositor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ abstract contract BatchDepositor is IBatchDepositor, ReentrancyGuard
IDepositContract public immutable depositContract;

mapping (uint => mapping (bytes32 => uint)) public pendingDeposits;
mapping (uint => mapping(uint => bool)) public withdrawn;
mapping (uint => mapping (uint => bool)) public withdrawn;
// token -> tokenID
mapping (address => uint16) public cachedTokenIDs;
uint public batchIDGenerator;
Expand Down Expand Up @@ -193,10 +193,10 @@ abstract contract BatchDepositor is IBatchDepositor, ReentrancyGuard
IBatchDepositor.Deposit[] memory _deposits = depositsList[i];
for (uint j = 0; j < _deposits.length; j++) {
deposit = _deposits[j];
if(token != deposit.token) {
if (token != deposit.token) {
token = deposit.token;
tokenIdx = 0;
while(tokenIdx < numDistinctTokens && tokens[tokenIdx].token != token) {
while (tokenIdx < numDistinctTokens && tokens[tokenIdx].token != token) {
tokenIdx++;
}
if (tokenIdx == numDistinctTokens) {
Expand All @@ -223,7 +223,7 @@ abstract contract BatchDepositor is IBatchDepositor, ReentrancyGuard
}

// Do a normal deposit per token
for(uint i = 0; i < numDistinctTokens; i++) {
for (uint i = 0; i < numDistinctTokens; i++) {
if (tokens[i].token == address(0)) {
require(tokens[i].amount == msg.value || from == address(this), "INVALID_ETH_DEPOSIT");
}
Expand Down
2 changes: 1 addition & 1 deletion packages/loopring_v3/contracts/core/iface/ExchangeData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ library ExchangeData
bytes32 merkleRoot;

// List of all blocks
mapping(uint => BlockInfo) blocks;
mapping (uint => BlockInfo) blocks;
uint numBlocks;

// List of all tokens
Expand Down
8 changes: 4 additions & 4 deletions packages/loopring_v3/contracts/lib/LPToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ contract LPToken is ERC20
string public symbol;
uint8 public decimals;

uint public override totalSupply;
mapping(address => uint) public override balanceOf;
mapping(address => mapping(address => uint)) public override allowance;
mapping(address => uint) public nonces;
uint public override totalSupply;
mapping (address => uint) public override balanceOf;
mapping (address => mapping (address => uint)) public override allowance;
mapping (address => uint) public nonces;

event Approval(address indexed owner, address indexed spender, uint value);
event Transfer(address indexed from, address indexed to, uint value);
Expand Down
2 changes: 1 addition & 1 deletion packages/loopring_v3/contracts/test/LRCToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ library SafeMath {
*/
contract BasicToken is ERC20Basic {
using SafeMath for uint;
mapping(address => uint) balances;
mapping (address => uint) balances;
uint totalSupply_;
/**
* @dev total number of tokens in existence
Expand Down
3 changes: 2 additions & 1 deletion packages/loopring_v3/contracts/test/TestAssetManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import "../lib/TransferUtil.sol";
import "../amm/LoopringAmmPool.sol";
import "../amm/IAssetManager.sol";


/// @author Brecht Devos - <[email protected]>
contract TestAssetManager is IAssetManager, Claimable
{
using MathUint for uint;
using TransferUtil for address;

mapping(address => mapping(address => uint)) public poolBalances;
mapping (address => mapping (address => uint)) public poolBalances;

function getBalances(
address pool,
Expand Down
2 changes: 1 addition & 1 deletion packages/loopring_v3/contracts/test/TestMigrationBridgeConnector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ contract TestMigrationBridgeConnector is IBridgeConnector
require(txs[i].token == settings.token, "WRONG_TOKEN_IN_GROUP");

address to = bridgeCall.owner;
if(bridgeCall.userData.length == 32) {
if (bridgeCall.userData.length == 32) {
UserSettings memory userSettings = abi.decode(bridgeCall.userData, (UserSettings));
to = userSettings.to;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/loopring_v3/contracts/test/TestSwappperBridgeConnector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ contract TestSwappperBridgeConnector is IBridgeConnector
uint ammountInInvalid = 0;
for (uint i = 0; i < txs.length; i++) {
bridgeTx = txs[i];
if(valid[i] && bridgeTx.userData.length == 32) {
if (valid[i] && bridgeTx.userData.length == 32) {
UserSettings memory userSettings = abi.decode(bridgeTx.userData, (UserSettings));
uint userAmountOut = uint(bridgeTx.amount).mul(amountOut) / amountInExpected;
if (userAmountOut < userSettings.minAmountOut) {
Expand Down
28 changes: 14 additions & 14 deletions packages/loopring_v3/contracts/thirdparty/MockContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@ contract MockContract is MockInterface {
bytes4 public constant SENTINEL_ANY_MOCKS = hex"01";

// A linked list allows easy iteration and inclusion checks
mapping(bytes32 => bytes) calldataMocks;
mapping(bytes => MockType) calldataMockTypes;
mapping(bytes => bytes) calldataExpectations;
mapping(bytes => string) calldataRevertMessage;
mapping(bytes32 => uint) calldataInvocations;

mapping(bytes4 => bytes4) methodIdMocks;
mapping(bytes4 => MockType) methodIdMockTypes;
mapping(bytes4 => bytes) methodIdExpectations;
mapping(bytes4 => string) methodIdRevertMessages;
mapping(bytes32 => uint) methodIdInvocations;
mapping (bytes32 => bytes) calldataMocks;
mapping (bytes => MockType) calldataMockTypes;
mapping (bytes => bytes) calldataExpectations;
mapping (bytes => string) calldataRevertMessage;
mapping (bytes32 => uint) calldataInvocations;

mapping (bytes4 => bytes4) methodIdMocks;
mapping (bytes4 => MockType) methodIdMockTypes;
mapping (bytes4 => bytes) methodIdExpectations;
mapping (bytes4 => string) methodIdRevertMessages;
mapping (bytes32 => uint) methodIdInvocations;

MockType fallbackMockType;
bytes fallbackExpectation;
Expand Down Expand Up @@ -261,7 +261,7 @@ contract MockContract is MockInterface {
bytes memory nextMock = calldataMocks[MOCKS_LIST_START];
bytes32 mockHash = keccak256(nextMock);
// We cannot compary bytes
while(mockHash != MOCKS_LIST_END_HASH) {
while (mockHash != MOCKS_LIST_END_HASH) {
// Reset all mock maps
calldataMockTypes[nextMock] = MockType.Return;
calldataExpectations[nextMock] = hex"";
Expand All @@ -278,7 +278,7 @@ contract MockContract is MockInterface {

// Reset all any calldataMocks
bytes4 nextAnyMock = methodIdMocks[SENTINEL_ANY_MOCKS];
while(nextAnyMock != SENTINEL_ANY_MOCKS) {
while (nextAnyMock != SENTINEL_ANY_MOCKS) {
bytes4 currentAnyMock = nextAnyMock;
methodIdMockTypes[currentAnyMock] = MockType.Return;
methodIdExpectations[currentAnyMock] = hex"";
Expand All @@ -297,7 +297,7 @@ contract MockContract is MockInterface {
}

function useAllGas() private {
while(true) {
while (true) {
bool s;
assembly {
//expensive call to EC multiply contract
Expand Down