From cf40142f3111148b99b9a4c36503a99e175f1cc1 Mon Sep 17 00:00:00 2001
From: Oren Zakay <oren.zakay@kik.com>
Date: Sun, 12 Nov 2017 09:59:35 +0200
Subject: [PATCH] accounts/abi: refactor to pass tests

---
 accounts/abi/event.go  | 13 ++++++-------
 accounts/abi/method.go | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/accounts/abi/event.go b/accounts/abi/event.go
index 14819962a7..a69ebf86a5 100644
--- a/accounts/abi/event.go
+++ b/accounts/abi/event.go
@@ -133,15 +133,14 @@ func (e Event) singleUnpack(v interface{}, output []byte) error {
 
 	// if we reach this part, there is only one output member from the contract event.
 	// for mobile, the result type is always a slice.
-	var firstValue reflect.Value
-	if reflect.Slice == value.Kind() {
-		// take the first element
-		firstValue = value.Index(0).Elem()
-	} else {
-		firstValue = value
+	if reflect.Slice == value.Kind() && value.Len() >= 1 {
+		//check if it's not a byte slice
+		if reflect.TypeOf([]byte{}) != value.Type() {
+			value = value.Index(0).Elem()
+		}
 	}
 
-	if err := set(firstValue, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
+	if err := set(value, reflect.ValueOf(marshalledValue), e.Inputs[0]); err != nil {
 		return err
 	}
 	return nil
diff --git a/accounts/abi/method.go b/accounts/abi/method.go
index 4c52c5f6eb..185f518505 100644
--- a/accounts/abi/method.go
+++ b/accounts/abi/method.go
@@ -153,15 +153,14 @@ func (method Method) singleUnpack(v interface{}, output []byte) error {
 
 	// if we reach this part, there is only one output member from the contract method.
 	// for mobile, the result type is always a slice.
-	var firstValue reflect.Value
-	if reflect.Slice == value.Kind() {
-		// take the first element
-		firstValue = value.Index(0).Elem()
-	} else {
-		firstValue = value
+	if reflect.Slice == value.Kind() && value.Len() >= 1 {
+		//check if it's not a byte slice
+		if reflect.TypeOf([]byte{}) != value.Type() {
+			value = value.Index(0).Elem()
+		}
 	}
 
-	if err := set(firstValue, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
+	if err := set(value, reflect.ValueOf(marshalledValue), method.Outputs[0]); err != nil {
 		return err
 	}
 	return nil