From 5f00a8688cd7a324ee91bb3c06a09382a08694df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Ma=C5=82achowicz?= <filip.malachowicz@gmail.com>
Date: Sun, 2 Sep 2018 12:22:57 +0200
Subject: [PATCH 1/2] Move all used datastructures from utils module

---
 tests/core/middleware/test_stalecheck.py   | 6 +++---
 tests/core/utilities/test_attributedict.py | 2 +-
 web3/{utils => }/datastructures.py         | 1 -
 web3/manager.py                            | 6 +++---
 web3/middleware/attrdict.py                | 2 +-
 web3/providers/rpc.py                      | 6 +++---
 web3/utils/events.py                       | 6 +++---
 7 files changed, 14 insertions(+), 15 deletions(-)
 rename web3/{utils => }/datastructures.py (99%)

diff --git a/tests/core/middleware/test_stalecheck.py b/tests/core/middleware/test_stalecheck.py
index 36450d1e38..3cc9a53752 100644
--- a/tests/core/middleware/test_stalecheck.py
+++ b/tests/core/middleware/test_stalecheck.py
@@ -5,6 +5,9 @@
     patch,
 )
 
+from web3.datastructures import (
+    AttributeDict,
+)
 from web3.middleware import (
     make_stalecheck_middleware,
 )
@@ -12,9 +15,6 @@
     StaleBlockchain,
     _isfresh,
 )
-from web3.utils.datastructures import (
-    AttributeDict,
-)
 
 
 @pytest.fixture
diff --git a/tests/core/utilities/test_attributedict.py b/tests/core/utilities/test_attributedict.py
index 4d34702095..a8f3dc2616 100644
--- a/tests/core/utilities/test_attributedict.py
+++ b/tests/core/utilities/test_attributedict.py
@@ -1,6 +1,6 @@
 import pytest
 
-from web3.utils.datastructures import (
+from web3.datastructures import (
     AttributeDict,
 )
 
diff --git a/web3/utils/datastructures.py b/web3/datastructures.py
similarity index 99%
rename from web3/utils/datastructures.py
rename to web3/datastructures.py
index 09b878444e..7b5510b1a1 100644
--- a/web3/utils/datastructures.py
+++ b/web3/datastructures.py
@@ -1,4 +1,3 @@
-
 from collections import (
     Hashable,
     Mapping,
diff --git a/web3/manager.py b/web3/manager.py
index 2ca9c214a6..737a2c6807 100644
--- a/web3/manager.py
+++ b/web3/manager.py
@@ -5,6 +5,9 @@
     is_list_like,
 )
 
+from web3.datastructures import (
+    NamedElementOnion,
+)
 from web3.exceptions import (
     CannotHandleRequest,
     UnhandledRequest,
@@ -22,9 +25,6 @@
 from web3.providers import (
     AutoProvider,
 )
-from web3.utils.datastructures import (
-    NamedElementOnion,
-)
 from web3.utils.empty import (
     empty,
 )
diff --git a/web3/middleware/attrdict.py b/web3/middleware/attrdict.py
index 2e38c99bbf..7aef9bb39d 100644
--- a/web3/middleware/attrdict.py
+++ b/web3/middleware/attrdict.py
@@ -2,7 +2,7 @@
     is_dict,
 )
 
-from web3.utils.datastructures import (
+from web3.datastructures import (
     AttributeDict,
 )
 from web3.utils.toolz import (
diff --git a/web3/providers/rpc.py b/web3/providers/rpc.py
index 4af854590f..bd07acce39 100644
--- a/web3/providers/rpc.py
+++ b/web3/providers/rpc.py
@@ -5,12 +5,12 @@
     to_dict,
 )
 
+from web3.datastructures import (
+    NamedElementOnion,
+)
 from web3.middleware import (
     http_retry_request_middleware,
 )
-from web3.utils.datastructures import (
-    NamedElementOnion,
-)
 from web3.utils.http import (
     construct_user_agent,
 )
diff --git a/web3/utils/events.py b/web3/utils/events.py
index 6f83342e75..16d8458a3b 100644
--- a/web3/utils/events.py
+++ b/web3/utils/events.py
@@ -15,12 +15,12 @@
     to_tuple,
 )
 
+from web3.datastructures import (
+    AttributeDict,
+)
 from web3.exceptions import (
     MismatchedABI,
 )
-from web3.utils.datastructures import (
-    AttributeDict,
-)
 from web3.utils.encoding import (
     hexstr_if_str,
     to_bytes,

From 7d25e541a69f4c7adb43fb64a8bfa57501ba1a58 Mon Sep 17 00:00:00 2001
From: Piper Merriam <piper@pipermerriam.com>
Date: Mon, 3 Sep 2018 10:04:41 -0600
Subject: [PATCH 2/2] Update Unicorn token totalSupply expectation.

---
 docs/examples.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples.rst b/docs/examples.rst
index ba126e6f1a..f3f3606218 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -343,7 +343,7 @@ Fetch various data about the current state of the ERC20 contract.
     >>> erc20.functions.decimals().call()
     0
     >>> erc20.functions.totalSupply().call()
-    2038
+    2039
 
 Get the balance of an account address.