From 40ee6f87f04ec79a6bf67dea6e9cd5f4e89b8638 Mon Sep 17 00:00:00 2001
From: Ian Macalinao <me@ian.pw>
Date: Tue, 24 Jul 2018 06:12:49 -0700
Subject: [PATCH] eth/filters: improve error message for invalid filter topics
 (#17234)

---
 eth/filters/api.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eth/filters/api.go b/eth/filters/api.go
index beeb359f74..d7c053c44d 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -585,7 +585,7 @@ func decodeAddress(s string) (common.Address, error) {
 	}
 	b, err := hexutil.Decode(s)
 	if err == nil && len(b) != common.AddressLength {
-		err = fmt.Errorf("hex has invalid length %d after decoding", len(b))
+		err = fmt.Errorf("hex has invalid length %d after decoding; expected %d for address", len(b), common.AddressLength)
 	}
 	return common.BytesToAddress(b), err
 }
@@ -593,7 +593,7 @@ func decodeAddress(s string) (common.Address, error) {
 func decodeTopic(s string) (common.Hash, error) {
 	b, err := hexutil.Decode(s)
 	if err == nil && len(b) != common.HashLength {
-		err = fmt.Errorf("hex has invalid length %d after decoding", len(b))
+		err = fmt.Errorf("hex has invalid length %d after decoding; expected %d for topic", len(b), common.HashLength)
 	}
 	return common.BytesToHash(b), err
 }