Merge branch 'release/1.1' into lib_advance_test_fix

Author: linh2931

tests/TestHarness/launcher.py

@@ -359,22 +359,22 @@ def init_genesis(self):
                         'initial_key': self.network.nodes['bios'].keys[0].pubkey,
                         'initial_configuration': {
                             'max_block_net_usage': 1048576,
-                            'target_block_net_usage_pct': 1000,
+                            'target_block_net_usage_pct': 10000,
                             'max_transaction_net_usage': 524288,
                             'base_per_transaction_net_usage': 12,
                             'net_usage_leeway': 500,
                             'context_free_discount_net_usage_num': 20,
                             'context_free_discount_net_usage_den': 100,
-                            'max_block_cpu_usage': 500000 if self.args.max_block_cpu_usage is None else self.args.max_block_cpu_usage,
-                            'target_block_cpu_usage_pct': 1000,
-                            'max_transaction_cpu_usage': 475000 if self.args.max_transaction_cpu_usage is None else self.args.max_transaction_cpu_usage,
+                            'max_block_cpu_usage': 200000 if self.args.max_block_cpu_usage is None else self.args.max_block_cpu_usage,
+                            'target_block_cpu_usage_pct': 10,
+                            'max_transaction_cpu_usage': 150000 if self.args.max_transaction_cpu_usage is None else self.args.max_transaction_cpu_usage,
                             'min_transaction_cpu_usage': 100,
                             'max_transaction_lifetime': 3600,
                             'deferred_trx_expiration_window': 600,
                             'max_transaction_delay': 3888000,
-                            'max_inline_action_size': 524288,
-                            'max_inline_action_depth': 4,
-                            'max_authority_depth': 6
+                            'max_inline_action_size': 524287,
+                            'max_inline_action_depth': 10,
+                            'max_authority_depth': 10
                         }
                     }
         else: