modify create_qrcode_base64

diff --git a/app/api/__init__.py b/app/api/__init__.py
index cec8bc8..0cba20e 100644 (file)
--- a/app/api/__init__.py
+++ b/app/api/__init__.py
@@ -19,7 +19,7 @@ from app.api.resources import Create_P2WPKH_Program
 from app.api.resources import Create_Address
 from app.api.resources import Get_Path_From_Index
 from app.api.resources import Broadcast_Transaction
-from app.api.resources import Create_Address_QRcode
+from app.api.resources import Create_QRcode_Base64
 
 blueprint = Blueprint('api', __name__, url_prefix='/api/v1')
 api = Api(blueprint)
@@ -42,4 +42,4 @@ api.add_resource(Create_P2WPKH_Program, '/create_P2WPKH_program')
 api.add_resource(Create_Address, '/create_address')
 api.add_resource(Get_Path_From_Index, '/get_path_from_index')
 api.add_resource(Broadcast_Transaction, '/broadcast_transaction')
-api.add_resource(Create_Address_QRcode, '/create_address_qrcode')
\ No newline at end of file
+api.add_resource(Create_QRcode_Base64, '/create_qrcode_base64')
\ No newline at end of file

diff --git a/app/api/resources.py b/app/api/resources.py
index 36c5091..18f7555 100644 (file)
--- a/app/api/resources.py
+++ b/app/api/resources.py
@@ -19,7 +19,7 @@ from app.model.key import xpub_to_child_xpub
 from app.model.receiver import create_P2WPKH_program
 from app.model.receiver import create_address
 from app.model.receiver import get_path_from_index
-from app.model.receiver import create_address_qrcode
+from app.model.receiver import create_qrcode_base64
 from app.model.transaction import broadcast_transaction
 
 
@@ -41,6 +41,7 @@ parser.add_argument('control_program_str', type=str)
 parser.add_argument('network_str', type=str)
 parser.add_argument('raw_transaction_str', type=str)
 parser.add_argument('address_str', type=str)
+parser.add_argument('s', type=str)
 
 class Hello(Resource):
 
@@ -197,10 +198,10 @@ class Broadcast_Transaction(Resource):
         response = broadcast_transaction(raw_transaction, network)
         return response
 
-class Create_Address_QRcode(Resource):
+class Create_QRcode_Base64(Resource):
 
     def post(self):
         args = parser.parse_args()
-        address = args.get('address_str')
-        img = create_address_qrcode(address)
+        s = args.get('s')
+        img = create_qrcode_base64(s)
         return img
\ No newline at end of file

diff --git a/app/model/receiver.py b/app/model/receiver.py
index cff56e7..9b60dc8 100644 (file)
--- a/app/model/receiver.py
+++ b/app/model/receiver.py
@@ -124,9 +124,10 @@ def create_address(control_program_str, network_str):
     address_str = segwit_addr.encode(hrp, 0, bytes.fromhex(public_key_hash_str))
     return address_str
 
-# create_address_qrcode create address qrcode, then encode it to base64
-def create_address_qrcode(address_str):
-    img = qrcode.make(address_str)
+# create_qrcode_base64 create qrcode, then encode it to base64
+# type(s) is str
+def create_qrcode_base64(s):
+    img = qrcode.make(s)
     buffered = BytesIO()
     img.save(buffered, format="JPEG")
     return pybase64.b64encode(buffered.getvalue()).decode("utf-8")