forked from TrueCloudLab/frostfs-contract
[#134] container: Use Hash256 for container ID in Delete()
This is what we use inside Put(). It leads to a better auto-generated code. Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
7e0f9b8b8e
commit
762d7f9f9f
3 changed files with 17 additions and 7 deletions
|
@ -29,7 +29,7 @@ events:
|
|||
- name: DeleteSuccess
|
||||
parameters:
|
||||
- name: containerID
|
||||
type: ByteArray
|
||||
type: Hash256
|
||||
- name: SetEACLSuccess
|
||||
parameters:
|
||||
- name: containerID
|
||||
|
|
|
@ -279,7 +279,7 @@ func checkNiceNameAvailable(nnsContractAddr interop.Hash160, domain string) bool
|
|||
// API.
|
||||
//
|
||||
// If the container doesn't exist, it panics with NotFoundError.
|
||||
func Delete(containerID []byte, signature interop.Signature, publicKey interop.PublicKey, token []byte) {
|
||||
func Delete(containerID interop.Hash256, signature interop.Signature, publicKey interop.PublicKey, token []byte) {
|
||||
ctx := storage.GetContext()
|
||||
|
||||
ownerID := getOwnerByID(ctx, containerID)
|
||||
|
|
|
@ -25,7 +25,7 @@ type PutSuccessEvent struct {
|
|||
|
||||
// DeleteSuccessEvent represents "DeleteSuccess" event emitted by the contract.
|
||||
type DeleteSuccessEvent struct {
|
||||
ContainerID []byte
|
||||
ContainerID util.Uint256
|
||||
}
|
||||
|
||||
// SetEACLSuccessEvent represents "SetEACLSuccess" event emitted by the contract.
|
||||
|
@ -163,14 +163,14 @@ func (c *ContractReader) Version() (*big.Int, error) {
|
|||
// Delete creates a transaction invoking `delete` method of the contract.
|
||||
// This transaction is signed and immediately sent to the network.
|
||||
// The values returned are its hash, ValidUntilBlock value and error if any.
|
||||
func (c *Contract) Delete(containerID []byte, signature []byte, publicKey *keys.PublicKey, token []byte) (util.Uint256, uint32, error) {
|
||||
func (c *Contract) Delete(containerID util.Uint256, signature []byte, publicKey *keys.PublicKey, token []byte) (util.Uint256, uint32, error) {
|
||||
return c.actor.SendCall(c.hash, "delete", containerID, signature, publicKey, token)
|
||||
}
|
||||
|
||||
// DeleteTransaction creates a transaction invoking `delete` method of the contract.
|
||||
// This transaction is signed, but not sent to the network, instead it's
|
||||
// returned to the caller.
|
||||
func (c *Contract) DeleteTransaction(containerID []byte, signature []byte, publicKey *keys.PublicKey, token []byte) (*transaction.Transaction, error) {
|
||||
func (c *Contract) DeleteTransaction(containerID util.Uint256, signature []byte, publicKey *keys.PublicKey, token []byte) (*transaction.Transaction, error) {
|
||||
return c.actor.MakeCall(c.hash, "delete", containerID, signature, publicKey, token)
|
||||
}
|
||||
|
||||
|
@ -178,7 +178,7 @@ func (c *Contract) DeleteTransaction(containerID []byte, signature []byte, publi
|
|||
// This transaction is not signed, it's simply returned to the caller.
|
||||
// Any fields of it that do not affect fees can be changed (ValidUntilBlock,
|
||||
// Nonce), fee values (NetworkFee, SystemFee) can be increased as well.
|
||||
func (c *Contract) DeleteUnsigned(containerID []byte, signature []byte, publicKey *keys.PublicKey, token []byte) (*transaction.Transaction, error) {
|
||||
func (c *Contract) DeleteUnsigned(containerID util.Uint256, signature []byte, publicKey *keys.PublicKey, token []byte) (*transaction.Transaction, error) {
|
||||
return c.actor.MakeUnsignedCall(c.hash, "delete", nil, containerID, signature, publicKey, token)
|
||||
}
|
||||
|
||||
|
@ -480,7 +480,17 @@ func (e *DeleteSuccessEvent) FromStackItem(item *stackitem.Array) error {
|
|||
err error
|
||||
)
|
||||
index++
|
||||
e.ContainerID, err = arr[index].TryBytes()
|
||||
e.ContainerID, err = func(item stackitem.Item) (util.Uint256, error) {
|
||||
b, err := item.TryBytes()
|
||||
if err != nil {
|
||||
return util.Uint256{}, err
|
||||
}
|
||||
u, err := util.Uint256DecodeBytesBE(b)
|
||||
if err != nil {
|
||||
return util.Uint256{}, err
|
||||
}
|
||||
return u, nil
|
||||
}(arr[index])
|
||||
if err != nil {
|
||||
return fmt.Errorf("field ContainerID: %w", err)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue