*: use (Hash160).Equals instead of common.BytesEqual where possible

Part 1 from #307. Signed-off-by: Anna Shaleva <anna@nspcc.ru>
nspcc-dev · Jan 31, 2023 · 9c8d3c0 · 9c8d3c0
1 parent 7b31fb3
commit 9c8d3c0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/alphabet/alphabet_contract.go b/alphabet/alphabet_contract.go
@@ -27,7 +27,7 @@ const (
 // contracts.
 func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
 	caller := runtime.GetCallingScriptHash()
-	if !common.BytesEqual(caller, []byte(gas.Hash)) && !common.BytesEqual(caller, []byte(neo.Hash)) {
+	if !caller.Equals(gas.Hash) && !caller.Equals(neo.Hash) {
 		common.AbortWithMessage("alphabet contract accepts GAS and NEO only")
 	}
 }

diff --git a/balance/balance_contract.go b/balance/balance_contract.go
@@ -494,7 +494,7 @@ func isUsableAddress(addr interop.Hash160) bool {
 
 		// Check if a smart contract is calling script hash
 		callingScriptHash := runtime.GetCallingScriptHash()
-		if common.BytesEqual(callingScriptHash, addr) {
+		if callingScriptHash.Equals(addr) {
 			return true
 		}
 	}

diff --git a/common/vote.go b/common/vote.go
@@ -145,5 +145,5 @@ func InvokeID(args []interface{}, prefix []byte) []byte {
 
 func FromKnownContract(ctx storage.Context, caller interop.Hash160, key string) bool {
 	addr := storage.Get(ctx, key).(interop.Hash160)
-	return BytesEqual(caller, addr)
+	return caller.Equals(addr)
 }
diff --git a/neofs/neofs_contract.go b/neofs/neofs_contract.go
@@ -236,7 +236,7 @@ func InnerRingCandidateAdd(key interop.PublicKey) {
 // break JSON limits for integers when precision is converted.
 func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
 	rcv := data.(interop.Hash160)
-	if common.BytesEqual(rcv, []byte(ignoreDepositNotification)) {
+	if rcv.Equals(ignoreDepositNotification) {
 		return
 	}
 
@@ -247,7 +247,7 @@ func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
 	}
 
 	caller := runtime.GetCallingScriptHash()
-	if !common.BytesEqual(caller, interop.Hash160(gas.Hash)) {
+	if !caller.Equals(gas.Hash) {
 		common.AbortWithMessage("only GAS can be accepted for deposit")
 	}
 

diff --git a/processing/processing_contract.go b/processing/processing_contract.go
@@ -21,7 +21,7 @@ const (
 // OnNEP17Payment is a callback for NEP-17 compatible native GAS contract.
 func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
 	caller := runtime.GetCallingScriptHash()
-	if !common.BytesEqual(caller, []byte(gas.Hash)) {
+	if !caller.Equals(gas.Hash) {
 		common.AbortWithMessage("processing contract accepts GAS only")
 	}
 }

diff --git a/proxy/proxy_contract.go b/proxy/proxy_contract.go
@@ -13,7 +13,7 @@ import (
 // OnNEP17Payment is a callback for NEP-17 compatible native GAS contract.
 func OnNEP17Payment(from interop.Hash160, amount int, data interface{}) {
 	caller := runtime.GetCallingScriptHash()
-	if !common.BytesEqual(caller, []byte(gas.Hash)) {
+	if !caller.Equals(gas.Hash) {
 		common.AbortWithMessage("proxy contract accepts GAS only")
 	}
 }