Merge pull request #401 from fiestared/ALIS-4141

Alis 4141

Author: keillera

src/common/settings.py

@@ -391,7 +391,7 @@
 # Private chain
 HISTORY_RANGE_DAYS = 30
 AVERAGE_BLOCK_TIME = 30
-TRANSACTION_CONFIRM_COUNT = 15
+TRANSACTION_CONFIRM_COUNT = 5
 
 AUTHLETE_CLIENT_ENDPOINT = 'https://api.authlete.com/api/client'
 AUTHLETE_SCOPE_READ = 'read'

src/handlers/me/wallet/tip/me_wallet_tip.py

@@ -82,6 +82,8 @@ def exec_main_proc(self):
             if PrivateChainUtil.is_transaction_completed(transaction_hash):
                 # バーンのトランザクション処理
                 burn_transaction = self.__burn_transaction(burn_quantity, from_user_eth_address, auth, headers)
+            else:
+                logging.info('Burn was not executed because tip transaction was uncompleted.')
         except Exception as err:
             logging.fatal(err)
             traceback.print_exc()

tests/common/test_private_chain_util.py

@@ -68,16 +68,6 @@ def test_is_transaction_completed_ok(self):
     def test_is_transaction_completed_ok_last(self):
         with patch('requests.post') as mock_post:
             mock_post.side_effect = [
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
@@ -94,16 +84,6 @@ def test_is_transaction_completed_ok_last(self):
     def test_is_transaction_completed_ok_multiple_logs(self):
         with patch('requests.post') as mock_post:
             mock_post.side_effect = [
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
@@ -120,16 +100,6 @@ def test_is_transaction_completed_ok_multiple_logs(self):
     def test_is_transaction_completed_ng_count_over(self):
         with patch('requests.post') as mock_post:
             mock_post.side_effect = [
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
-                FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),
                 FakeResponse(status_code=200, text='{}'),