Skip to content

feat: add RegisterUser #21

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

Open
0xmountaintop wants to merge 18 commits into
base: master
Choose a base branch
from
Open

feat: add RegisterUser #21

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1b783ba
init user_map
0xmountaintop May 19, 2021
29d683c
init registerUser
0xmountaintop May 19, 2021
585f2c3
add registerUser()
0xmountaintop May 19, 2021
efd4e56
add event
0xmountaintop May 19, 2021
f883920
add bjjPubkey
0xmountaintop May 20, 2021
5408c07
fix test
0xmountaintop May 20, 2021
0cb6652
WIP
0xmountaintop May 20, 2021
50e153f
fix register logic
0xmountaintop May 20, 2021
b2eaae4
fix
0xmountaintop May 20, 2021
b852cf9
length check
0xmountaintop May 20, 2021
27aaffc
fix tobjj
0xmountaintop May 20, 2021
aa1a1f3
update test
0xmountaintop May 20, 2021
7327b83
minor
0xmountaintop May 20, 2021
45a00f0
minor
0xmountaintop May 20, 2021
32da44e
use bytes32
0xmountaintop May 20, 2021
ec55b12
minor
0xmountaintop May 20, 2021
8debaa8
minor
0xmountaintop May 20, 2021
f3113f2
use string
0xmountaintop May 20, 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
Prev Previous commit
Next Next commit
fix test
  • Loading branch information
@0xmountaintop
0xmountaintop committed May 20, 2021
commit 5408c07ef9aa6398dfea8f9fc21bf6251bb3dda4
6 changes: 4 additions & 2 deletions test/token.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ describe("Fluidex", () => {
);

// TODO: NewPriorityRequest event
const mockBjj = [];
await expect(
fluidex
.connect(acc2)
.depositERC20(erc20Mock.address, acc2addr, depositAmount)
.depositERC20(erc20Mock.address, mockBjj, acc2addr, depositAmount)
)
.to.emit(fluidex, "Deposit")
.withArgs(tokenId, acc2addr, depositAmount);
Expand All @@ -66,10 +67,11 @@ describe("Fluidex", () => {
const withdrawAmount = 300;

// TODO: NewPriorityRequest event
const mockBjj = [];
await expect(
fluidex
.connect(acc2)
.depositETH(acc2addr, {value: depositAmount})
.depositETH(mockBjj, acc2addr, {value: depositAmount})
)
.to.emit(fluidex, "Deposit")
.withArgs(0, acc2addr, depositAmount);
Expand Down