From 65f47b02b024f5c52d0f4008788235da8fd8d51d Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holger@nahrstaedt.de>
Date: Tue, 6 Mar 2018 15:50:55 +0100
Subject: [PATCH] Bug fix release 0.19.12
---
README.rst | 4 ++++
beem/version.py | 2 +-
beemapi/version.py | 2 +-
beembase/version.py | 2 +-
beemgrapheneapi/graphenerpc.py | 9 +++++++--
beemgrapheneapi/version.py | 2 +-
beemgraphenebase/version.py | 2 +-
examples/benchmark_beem.py | 4 ++--
setup.py | 2 +-
9 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/README.rst b/README.rst
index dbc1c44a..ca9c49de 100644
--- a/README.rst
+++ b/README.rst
@@ -122,6 +122,10 @@ Documentation is available at http://beem.readthedocs.io/en/latest/
Changelog
=========
+0.19.12
+-------
+* bug fix release for condenser_api
+
0.19.11
-------
* beem is appbase ready
diff --git a/beem/version.py b/beem/version.py
index 21ea1059..c199b443 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.11'
+version = '0.19.12'
diff --git a/beemapi/version.py b/beemapi/version.py
index 21ea1059..c199b443 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.11'
+version = '0.19.12'
diff --git a/beembase/version.py b/beembase/version.py
index 21ea1059..c199b443 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.11'
+version = '0.19.12'
diff --git a/beemgrapheneapi/graphenerpc.py b/beemgrapheneapi/graphenerpc.py
index 61ec4c80..216090b1 100644
--- a/beemgrapheneapi/graphenerpc.py
+++ b/beemgrapheneapi/graphenerpc.py
@@ -229,6 +229,11 @@ class GrapheneRPC(object):
"params": [api_name, name, list(args)],
"jsonrpc": "2.0",
"id": self.get_request_id()}
+ elif api_name == "condenser_api":
+ query = {"method": api_name + "." + name,
+ "jsonrpc": "2.0",
+ "params": [],
+ "id": self.get_request_id()}
else:
query = {"method": api_name + "." + name,
"jsonrpc": "2.0",
@@ -241,7 +246,7 @@ class GrapheneRPC(object):
# Sepcify the api to talk to
if "api_id" not in kwargs:
if ("api" in kwargs):
- api_name = kwargs["api"] + "_api"
+ api_name = kwargs["api"].replace("_api", "") + "_api"
else:
api_id = 0
api_name = None
@@ -253,7 +258,7 @@ class GrapheneRPC(object):
if "api_id" not in kwargs:
if ("api" in kwargs):
if kwargs["api"] != "jsonrpc":
- api_name = kwargs["api"] + "_api"
+ api_name = kwargs["api"].replace("_api", "") + "_api"
else:
api_name = kwargs["api"]
else:
diff --git a/beemgrapheneapi/version.py b/beemgrapheneapi/version.py
index 21ea1059..c199b443 100644
--- a/beemgrapheneapi/version.py
+++ b/beemgrapheneapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.11'
+version = '0.19.12'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 21ea1059..c199b443 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.11'
+version = '0.19.12'
diff --git a/examples/benchmark_beem.py b/examples/benchmark_beem.py
index 16a9f784..6ab87fdc 100644
--- a/examples/benchmark_beem.py
+++ b/examples/benchmark_beem.py
@@ -16,8 +16,8 @@ from beem.utils import parse_time, formatTimedelta
if __name__ == "__main__":
# stm = Steem(node="https://api.steemit.com")
- # stm = Steem(node="https://api.steemitstage.com", appbase=True)
- # stm = Steem(node="wss://appbasetest.timcliff.com", appbase=False)
+ # stm = Steem(node="https://api.steemitstage.com")
+ # stm = Steem(node="wss://appbasetest.timcliff.com")
stm = Steem()
blockchain = Blockchain(steem_instance=stm)
last_block_id = 19273700
diff --git a/setup.py b/setup.py
index 9eac494f..0429fe5a 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
-VERSION = '0.19.11'
+VERSION = '0.19.12'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock']
--
GitLab