Skip to content

Refactor faucet for new testnet logic #286

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
xq262144 merged 14 commits into from
Mar 21, 2019
Merged

Refactor faucet for new testnet logic #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
207db59
Fix bug in dbms updatePermission call
Mar 18, 2019
c2d1e3d
Allow permission revocation in transaction processing
Mar 18, 2019
e6f964d
Update faucet to support various new web operations
Mar 18, 2019
c177346
Fix typo of errors package
Mar 18, 2019
2e3817d
Support overriding listen addr in faucet commandline
Mar 18, 2019
043148f
Return token amount in faucet api
Mar 18, 2019
2c9ee84
Use argTx instead of constant literal
Mar 18, 2019
39a3378
Add missing log to faucet persistence init error
Mar 18, 2019
19a750e
Add keystore in conf to docker ignore list
Mar 18, 2019
91701c6
Fix typo in faucet api callbacks
Mar 18, 2019
5b450ad
Add optional node count support for database creation
Mar 20, 2019
1e99e6e
Fix update permission test case nonce no
Mar 20, 2019
3c6b3e2
Golint issues
Mar 20, 2019
dd7f080
Add missing break to users permission update
Mar 21, 2019
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
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
test/
bin/cql*
conf/testnet*/*.keystore
*.cover.out
7 changes: 0 additions & 7 deletions blockproducer/metastate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,13 +825,6 @@ func (s *metaState) updatePermission(tx *types.UpdatePermission) (err error) {
}).WithError(ErrDatabaseNotFound).Error("unexpected error in updatePermission")
return ErrDatabaseNotFound
}
if !tx.Permission.IsValid() {
log.WithFields(log.Fields{
"permission": tx.Permission,
"dbID": tx.TargetSQLChain.DatabaseID(),
}).WithError(ErrInvalidPermission).Error("unexpected error in updatePermission")
return ErrInvalidPermission
}

// check whether sender has super privilege and find targetUser
numOfSuperUsers := 0
Expand Down
7 changes: 4 additions & 3 deletions blockproducer/metastate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,10 +1037,11 @@ func TestMetaState(t *testing.T) {
err = up.Sign(privKey1)
So(err, ShouldBeNil)
err = ms.apply(&up)
So(errors.Cause(err), ShouldEqual, ErrInvalidPermission)
So(err, ShouldBeNil)
// test permission update
// addr1(admin) update addr3 as admin
up.TargetUser = addr3
up.Nonce++
up.Permission = types.UserPermissionFromRole(types.Admin)
err = up.Sign(privKey1)
So(err, ShouldBeNil)
Expand Down Expand Up @@ -1073,7 +1074,7 @@ func TestMetaState(t *testing.T) {
err = ms.apply(&up)
So(errors.Cause(err), ShouldEqual, ErrNoSuperUserLeft)
// addr1(read) update addr3(admin) fail
up.Nonce = cd1.Nonce + 2
up.Nonce = cd1.Nonce + 3
err = up.Sign(privKey1)
So(err, ShouldBeNil)
err = ms.apply(&up)
Expand Down Expand Up @@ -1313,7 +1314,7 @@ func TestMetaState(t *testing.T) {
invalidIk3 := &types.IssueKeys{
IssueKeysHeader: types.IssueKeysHeader{
TargetSQLChain: dbAccount,
Nonce: 3,
Nonce: 4,
},
}
err = invalidIk3.Sign(privKey1)
Expand Down
Loading