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

Jump to bottom

Update solidity-data-structures package #953

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Update solidity-data-structures package #953

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 contracts/BatchExchange.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ contract BatchExchange is EpochTokenLocker {
* @return encoded packed bytes of user addresses
*/
function getUsersPaginated(address previousPageUser, uint16 pageSize) public view returns (bytes memory users) {
if (allUsers.size() == 0) {
if (allUsers.size == 0) {
return users;
}
uint16 count = 0;
Expand Down Expand Up @@ -482,7 +482,7 @@ contract BatchExchange is EpochTokenLocker {
uint16 previousPageUserOffset,
uint16 pageSize
) public view returns (bytes memory elements) {
if (allUsers.size() == 0) {
if (allUsers.size == 0) {
return elements;
}
uint16 currentOffset = previousPageUserOffset;
Expand Down Expand Up @@ -510,7 +510,7 @@ contract BatchExchange is EpochTokenLocker {
* @return encoded bytes representing all orders ordered by (user, index)
*/
function getEncodedOrders() public view returns (bytes memory elements) {
if (allUsers.size() > 0) {
if (allUsers.size > 0) {
address user = allUsers.first();
bool stop = false;
while (!stop) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"devDependencies": {
"@gnosis.pm/mock-contract": "^3.0.8",
"@gnosis.pm/owl-token": "^3.1.0",
"@gnosis.pm/solidity-data-structures": "=1.2.4",
"@gnosis.pm/solidity-data-structures": "1.3.5",
"@gnosis.pm/util-contracts": "^2.0.6",
"@openzeppelin/contracts": "=2.5.1",
"@truffle/contract": "^4.2.19",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,10 @@
"@gnosis.pm/util-contracts" "^2.0.0"
verify-on-etherscan "^1.1.1"

"@gnosis.pm/solidity-data-structures@=1.2.4":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@gnosis.pm/solidity-data-structures/-/solidity-data-structures-1.2.4.tgz#e7e0a2e4c3460a0166e7b985e7851e3a54e86607"
integrity sha512-s5AV1cTf1ERYPCWdC8+Zgx0oZDJTClpkbtXs8RcBFnuhADLd0QTwBowlS8iDsnQtfLNhcF0bDB1rzokJOSUGhg==
"@gnosis.pm/solidity-data-structures@1.3.5":
version "1.3.5"
resolved "https://registry.yarnpkg.com/@gnosis.pm/solidity-data-structures/-/solidity-data-structures-1.3.5.tgz#a38cab984a5a4c7d379454d5e82a2ac2f1a6b65e"
integrity sha512-qU32sUlH1cE26uhSSTbCYpskYzMm4KBXaIZdpu9v2xsO6jjedgfg9rKxJcor1V4ZRBp4EQyFqWzPx7fPTTPoUQ==
dependencies:
"@gnosis.pm/util-contracts" "^2.0.4"
ethereumjs-util "^6.1.0"
Expand Down