Skip to content

Commit 33a4c84

Browse files
committed
api: Remove unused getAllowRecord func
Signed-off-by: Evgenii Baidakov <evgenii@nspcc.io>
1 parent 765f374 commit 33a4c84

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

api/handler/acl.go

-15
Original file line numberDiff line numberDiff line change
@@ -1601,21 +1601,6 @@ func isValidGrant(grant *Grant) bool {
16011601
(grant.Grantee.Type == granteeCanonicalUser || (grant.Grantee.Type == granteeGroup && grant.Grantee.URI == allUsersGroup))
16021602
}
16031603

1604-
func getAllowRecord(op eacl.Operation, pk *keys.PublicKey) *eacl.Record {
1605-
record := eacl.NewRecord()
1606-
record.SetOperation(op)
1607-
record.SetAction(eacl.ActionAllow)
1608-
1609-
t := eacl.NewTarget()
1610-
// Unknown role is used, because it is ignored when keys are set
1611-
t.SetRole(eacl.RoleUnknown)
1612-
t.SetAccounts([]user.ID{user.NewFromScriptHash(pk.GetScriptHash())})
1613-
1614-
record.SetTargets(*t)
1615-
1616-
return record
1617-
}
1618-
16191604
func getAllowRecordWithUser(op eacl.Operation, acc user.ID) *eacl.Record {
16201605
record := eacl.NewRecord()
16211606
record.SetOperation(op)

api/handler/acl_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -931,14 +931,14 @@ func allowedTableForPrivateObject(t *testing.T, key *keys.PrivateKey, resInfo *r
931931
// Order of these loops is important for test.
932932
for i := len(writeOps) - 1; i >= 0; i-- {
933933
op := writeOps[i]
934-
record := getAllowRecord(op, key.PublicKey())
934+
record := getAllowRecordWithUser(op, user.NewFromScriptHash(key.GetScriptHash()))
935935

936936
applyFilters(record)
937937
expectedTable.AddRecord(record)
938938
}
939939
for i := len(readOps) - 1; i >= 0; i-- {
940940
op := readOps[i]
941-
record := getAllowRecord(op, key.PublicKey())
941+
record := getAllowRecordWithUser(op, user.NewFromScriptHash(key.GetScriptHash()))
942942

943943
applyFilters(record)
944944
expectedTable.AddRecord(record)
@@ -1175,10 +1175,10 @@ func TestBucketAclToTable(t *testing.T) {
11751175
expectedTable.AddRecord(getOthersRecord(op, eacl.ActionAllow))
11761176
}
11771177
for _, op := range writeOps {
1178-
expectedTable.AddRecord(getAllowRecord(op, key2.PublicKey()))
1178+
expectedTable.AddRecord(getAllowRecordWithUser(op, user.NewFromScriptHash(key2.GetScriptHash())))
11791179
}
11801180
for _, op := range fullOps {
1181-
expectedTable.AddRecord(getAllowRecord(op, key.PublicKey()))
1181+
expectedTable.AddRecord(getAllowRecordWithUser(op, user.NewFromScriptHash(key.GetScriptHash())))
11821182
}
11831183
for _, op := range fullOps {
11841184
expectedTable.AddRecord(getOthersRecord(op, eacl.ActionDeny))

0 commit comments

Comments
 (0)