From 23d9799e5125373a2e7f6d95a48ac110a64e3222 Mon Sep 17 00:00:00 2001
From: Pavel Karpy <carpawell@nspcc.ru>
Date: Mon, 29 Nov 2021 19:43:01 +0300
Subject: [PATCH] [#185] *: Use neo-go's `interop` constants instead of local
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
---
alphabet/alphabet_contract.go | 2 +-
audit/audit_contract.go | 2 +-
balance/balance_contract.go | 6 +++---
container/container_contract.go | 4 +++-
neofs/neofs_contract.go | 12 +++++-------
neofsid/neofsid_contract.go | 6 +++---
netmap/netmap_contract.go | 4 ++--
nns/nns_contract.go | 2 +-
processing/processing_contract.go | 2 +-
proxy/proxy_contract.go | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/alphabet/alphabet_contract.go b/alphabet/alphabet_contract.go
index f1756bc..c1723ab 100644
--- a/alphabet/alphabet_contract.go
+++ b/alphabet/alphabet_contract.go
@@ -48,7 +48,7 @@ func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
- if len(args.addrNetmap) != 20 || !args.notaryDisabled && len(args.addrProxy) != 20 {
+ if len(args.addrNetmap) != interop.Hash160Len || !args.notaryDisabled && len(args.addrProxy) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
diff --git a/audit/audit_contract.go b/audit/audit_contract.go
index c43fa26..cfa3995 100644
--- a/audit/audit_contract.go
+++ b/audit/audit_contract.go
@@ -54,7 +54,7 @@ func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
- if len(args.addrNetmap) != 20 {
+ if len(args.addrNetmap) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
diff --git a/balance/balance_contract.go b/balance/balance_contract.go
index 8f08ef8..8ac9f5d 100644
--- a/balance/balance_contract.go
+++ b/balance/balance_contract.go
@@ -71,7 +71,7 @@ func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
- if len(args.addrNetmap) != 20 || len(args.addrContainer) != 20 {
+ if len(args.addrNetmap) != interop.Hash160Len || len(args.addrContainer) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
@@ -276,7 +276,7 @@ func NewEpoch(epochNum int) {
it := storage.Find(ctx, []byte{}, storage.KeysOnly)
for iterator.Next(it) {
addr := iterator.Value(it).(interop.Hash160) // it MUST BE `storage.KeysOnly`
- if len(addr) != 20 {
+ if len(addr) != interop.Hash160Len {
continue
}
@@ -465,7 +465,7 @@ func (t Token) canTransfer(ctx storage.Context, from, to interop.Hash160, amount
)
if !innerRing {
- if len(to) != 20 || !isUsableAddress(from) {
+ if len(to) != interop.Hash160Len || !isUsableAddress(from) {
runtime.Log("bad script hashes")
return emptyAcc, false
}
diff --git a/container/container_contract.go b/container/container_contract.go
index ed03f45..b10b10c 100644
--- a/container/container_contract.go
+++ b/container/container_contract.go
@@ -100,7 +100,9 @@ func _deploy(data interface{}, isUpdate bool) {
return
}
- if len(args.addrNetmap) != 20 || len(args.addrBalance) != 20 || len(args.addrID) != 20 {
+ if len(args.addrNetmap) != interop.Hash160Len ||
+ len(args.addrBalance) != interop.Hash160Len ||
+ len(args.addrID) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
diff --git a/neofs/neofs_contract.go b/neofs/neofs_contract.go
index aa0d532..5f75964 100644
--- a/neofs/neofs_contract.go
+++ b/neofs/neofs_contract.go
@@ -33,8 +33,6 @@ const (
processingContractKey = "processingScriptHash"
- publicKeySize = 33
-
maxBalanceAmount = 9000 // Max integer of Fixed12 in JSON bound (2**53-1)
maxBalanceAmountGAS = maxBalanceAmount * 1_0000_0000
@@ -75,13 +73,13 @@ func _deploy(data interface{}, isUpdate bool) {
panic("at least one alphabet key must be provided")
}
- if len(args.addrProc) != 20 {
+ if len(args.addrProc) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
for i := 0; i < len(args.keys); i++ {
pub := args.keys[i]
- if len(pub) != publicKeySize {
+ if len(pub) != interop.PublicKeyCompressedLen {
panic("incorrect public key length")
}
irList = append(irList, common.IRNode{PublicKey: pub})
@@ -381,7 +379,7 @@ func Bind(user []byte, keys []interop.PublicKey) {
for i := 0; i < len(keys); i++ {
pubKey := keys[i]
- if len(pubKey) != publicKeySize {
+ if len(pubKey) != interop.PublicKeyCompressedLen {
panic("incorrect public key size")
}
}
@@ -401,7 +399,7 @@ func Unbind(user []byte, keys []interop.PublicKey) {
for i := 0; i < len(keys); i++ {
pubKey := keys[i]
- if len(pubKey) != publicKeySize {
+ if len(pubKey) != interop.PublicKeyCompressedLen {
panic("incorrect public key size")
}
}
@@ -442,7 +440,7 @@ func AlphabetUpdate(id []byte, args []interop.PublicKey) {
for i := 0; i < len(args); i++ {
pubKey := args[i]
- if len(pubKey) != publicKeySize {
+ if len(pubKey) != interop.PublicKeyCompressedLen {
panic("invalid public key in alphabet list")
}
diff --git a/neofsid/neofsid_contract.go b/neofsid/neofsid_contract.go
index 87f3215..6849010 100644
--- a/neofsid/neofsid_contract.go
+++ b/neofsid/neofsid_contract.go
@@ -51,7 +51,7 @@ func _deploy(data interface{}, isUpdate bool) {
addrContainer interop.Hash160
})
- if len(args.addrNetmap) != 20 || len(args.addrContainer) != 20 {
+ if len(args.addrNetmap) != interop.Hash160Len || len(args.addrContainer) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
@@ -118,7 +118,7 @@ func AddKey(owner []byte, keys []interop.PublicKey) {
}
for i := range keys {
- if len(keys[i]) != 33 {
+ if len(keys[i]) != interop.PublicKeyCompressedLen {
panic("incorrect public key")
}
}
@@ -175,7 +175,7 @@ func RemoveKey(owner []byte, keys []interop.PublicKey) {
}
for i := range keys {
- if len(keys[i]) != 33 {
+ if len(keys[i]) != interop.PublicKeyCompressedLen {
panic("incorrect public key")
}
}
diff --git a/netmap/netmap_contract.go b/netmap/netmap_contract.go
index 51f012f..f93ecc0 100644
--- a/netmap/netmap_contract.go
+++ b/netmap/netmap_contract.go
@@ -86,7 +86,7 @@ func _deploy(data interface{}, isUpdate bool) {
return
}
- if len(args.addrBalance) != 20 || len(args.addrContainer) != 20 {
+ if len(args.addrBalance) != interop.Hash160Len || len(args.addrContainer) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
@@ -252,7 +252,7 @@ func AddPeer(nodeInfo []byte) {
//
// Method panics when invoked with unsupported states.
func UpdateState(state int, publicKey interop.PublicKey) {
- if len(publicKey) != 33 {
+ if len(publicKey) != interop.PublicKeyCompressedLen {
panic("incorrect public key")
}
diff --git a/nns/nns_contract.go b/nns/nns_contract.go
index d44470c..60035de 100644
--- a/nns/nns_contract.go
+++ b/nns/nns_contract.go
@@ -666,7 +666,7 @@ func getIdRecordKey(tokenId []byte, name string, typ RecordType, id byte) []byte
// isValid returns true if the provided address is a valid Uint160.
func isValid(address interop.Hash160) bool {
- return address != nil && len(address) == 20
+ return address != nil && len(address) == interop.Hash160Len
}
// checkCommittee panics if the script container is not signed by the committee.
diff --git a/processing/processing_contract.go b/processing/processing_contract.go
index 8f071ca..de70135 100644
--- a/processing/processing_contract.go
+++ b/processing/processing_contract.go
@@ -37,7 +37,7 @@ func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
- if len(args.addrNeoFS) != 20 {
+ if len(args.addrNeoFS) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}
diff --git a/proxy/proxy_contract.go b/proxy/proxy_contract.go
index dcb9a5e..6c967af 100644
--- a/proxy/proxy_contract.go
+++ b/proxy/proxy_contract.go
@@ -34,7 +34,7 @@ func _deploy(data interface{}, isUpdate bool) {
ctx := storage.GetContext()
- if len(args.addrNetmap) != 20 {
+ if len(args.addrNetmap) != interop.Hash160Len {
panic("incorrect length of contract script hash")
}