TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-25 23:42:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3544 from nspcc-dev/fix-permission-extension

Browse source
This commit is contained in:
Roman Khimov 2024-08-05 16:17:19 +03:00 committed by GitHub
commit 39e0d60221
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/smartcontract/manifest/container.go
View file

@ -64,8 +64,12 @@ func (c *WildPermissionDescs) Restrict() {
// Add adds v to the container. // Add adds v to the container.
func (c *WildStrings) Add(v string) { c.Value = append(c.Value, v) } func (c *WildStrings) Add(v string) { c.Value = append(c.Value, v) }
// Add adds v to the container. // Add adds v to the container and converts container to non-wildcard (if it's still
func (c *WildPermissionDescs) Add(v PermissionDesc) { c.Value = append(c.Value, v) } // wildcard).
func (c *WildPermissionDescs) Add(v PermissionDesc) {
c.Value = append(c.Value, v)
c.Wildcard = false
}
// MarshalJSON implements the json.Marshaler interface. // MarshalJSON implements the json.Marshaler interface.
func (c WildStrings) MarshalJSON() ([]byte, error) { func (c WildStrings) MarshalJSON() ([]byte, error) {

11
pkg/smartcontract/manifest/container_test.go
View file

@ -81,6 +81,17 @@ func TestContainer_Add(t *testing.T) {
require.False(t, c.Contains(PermissionDesc{Type: PermissionHash, Value: random.Uint160()})) require.False(t, c.Contains(PermissionDesc{Type: PermissionHash, Value: random.Uint160()}))
require.False(t, c.Contains(PermissionDesc{Type: PermissionGroup, Value: pkRand.PublicKey()})) require.False(t, c.Contains(PermissionDesc{Type: PermissionGroup, Value: pkRand.PublicKey()}))
}) })
t.Run("from wildcard", func(t *testing.T) {
c := &WildPermissionDescs{
Value: nil,
Wildcard: true,
}
require.True(t, c.IsWildcard())
c.Add(PermissionDesc{Type: PermissionHash, Value: random.Uint160()})
require.False(t, c.IsWildcard())
})
} }
func TestContainer_MarshalJSON(t *testing.T) { func TestContainer_MarshalJSON(t *testing.T) {