Skip to content

Commit 76d4ac1

Browse files
authored
account/abi: convert if-else-if chain to tagged switch (#27869)
account/abi: conver if-else-if chain to tagged switch
1 parent 4af98d4 commit 76d4ac1

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

accounts/abi/method.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,12 @@ func NewMethod(name string, rawName string, funType FunctionType, mutability str
127127
state = state + " "
128128
}
129129
identity := fmt.Sprintf("function %v", rawName)
130-
if funType == Fallback {
130+
switch funType {
131+
case Fallback:
131132
identity = "fallback"
132-
} else if funType == Receive {
133+
case Receive:
133134
identity = "receive"
134-
} else if funType == Constructor {
135+
case Constructor:
135136
identity = "constructor"
136137
}
137138
str := fmt.Sprintf("%v(%v) %sreturns(%v)", identity, strings.Join(inputNames, ", "), state, strings.Join(outputNames, ", "))

accounts/abi/method_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,12 @@ func TestMethodString(t *testing.T) {
8484

8585
for _, test := range table {
8686
var got string
87-
if test.method == "fallback" {
87+
switch test.method {
88+
case "fallback":
8889
got = abi.Fallback.String()
89-
} else if test.method == "receive" {
90+
case "receive":
9091
got = abi.Receive.String()
91-
} else {
92+
default:
9293
got = abi.Methods[test.method].String()
9394
}
9495
if got != test.expectation {

accounts/abi/unpack.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,14 @@ func forEachUnpack(t Type, output []byte, start, size int) (interface{}, error)
160160
// this value will become our slice or our array, depending on the type
161161
var refSlice reflect.Value
162162

163-
if t.T == SliceTy {
163+
switch t.T {
164+
case SliceTy:
164165
// declare our slice
165166
refSlice = reflect.MakeSlice(t.GetType(), size, size)
166-
} else if t.T == ArrayTy {
167+
case ArrayTy:
167168
// declare our array
168169
refSlice = reflect.New(t.GetType()).Elem()
169-
} else {
170+
default:
170171
return nil, errors.New("abi: invalid type in array/slice unpacking stage")
171172
}
172173

0 commit comments

Comments
 (0)