From f10913193d45494bbc3947952109fc1b33201406 Mon Sep 17 00:00:00 2001 From: Bart Wyatt Date: Tue, 3 Apr 2018 14:36:13 -0400 Subject: [PATCH] re-type the pct variables --- contracts/eosio.system/eosio.system.abi | 4 ++-- contracts/eosio.system/voting.hpp | 4 ++-- contracts/eosiolib/privileged.hpp | 4 ++-- libraries/chain/include/eosio/chain/chain_config.hpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/eosio.system/eosio.system.abi b/contracts/eosio.system/eosio.system.abi index a4d001849..32fa4eb09 100644 --- a/contracts/eosio.system/eosio.system.abi +++ b/contracts/eosio.system/eosio.system.abi @@ -98,9 +98,9 @@ {"name":"max_transaction_cpu_usage", "type":"uint32"}, {"name":"max_transaction_net_usage", "type":"uint32"}, {"name":"max_block_cpu_usage", "type": "uint64"}, - {"name":"target_block_cpu_usage_pct", "type": "int32"}, + {"name":"target_block_cpu_usage_pct", "type": "uint32"}, {"name":"max_block_net_usage", "type": "uint64"}, - {"name":"target_block_net_usage_pct", "type": "int32"}, + {"name":"target_block_net_usage_pct", "type": "uint32"}, {"name":"max_transaction_lifetime", "type":"uint32"}, {"name":"max_transaction_exec_time", "type":"uint32"}, {"name":"max_authority_depth", "type":"uint16"}, diff --git a/contracts/eosio.system/voting.hpp b/contracts/eosio.system/voting.hpp index 05fc759ee..7010f4b86 100644 --- a/contracts/eosio.system/voting.hpp +++ b/contracts/eosio.system/voting.hpp @@ -253,9 +253,9 @@ namespace eosiosystem { std::array max_transaction_cpu_usage; std::array max_transaction_net_usage; std::array max_block_cpu_usage; - std::array target_block_cpu_usage_pct; + std::array target_block_cpu_usage_pct; std::array max_block_net_usage; - std::array target_block_net_usage_pct; + std::array target_block_net_usage_pct; std::array max_transaction_lifetime; std::array max_authority_depth; std::array max_transaction_exec_time; diff --git a/contracts/eosiolib/privileged.hpp b/contracts/eosiolib/privileged.hpp index 2c64aa105..3f9358efa 100644 --- a/contracts/eosiolib/privileged.hpp +++ b/contracts/eosiolib/privileged.hpp @@ -17,9 +17,9 @@ namespace eosio { uint32_t max_transaction_cpu_usage; uint32_t max_transaction_net_usage; uint64_t max_block_cpu_usage; - int target_block_cpu_usage_pct; + uint32_t target_block_cpu_usage_pct; uint64_t max_block_net_usage; - int target_block_net_usage_pct; + uint32_t target_block_net_usage_pct; uint32_t max_transaction_lifetime; uint32_t max_transaction_exec_time; uint16_t max_authority_depth; diff --git a/libraries/chain/include/eosio/chain/chain_config.hpp b/libraries/chain/include/eosio/chain/chain_config.hpp index 26a283590..b1a7ba612 100644 --- a/libraries/chain/include/eosio/chain/chain_config.hpp +++ b/libraries/chain/include/eosio/chain/chain_config.hpp @@ -32,9 +32,9 @@ struct chain_config { uint32_t max_transaction_net_usage; ///< the maximum objectively measured net usage that the chain will allow regardless of account limits uint64_t max_block_cpu_usage; ///< the maxiumum cpu usage in instructions for a block - int target_block_cpu_usage_pct; ///< the target percent (1% == 100, 100%= 10,000) of maximum cpu usage; exceeding this triggers congestion handling + uint32_t target_block_cpu_usage_pct; ///< the target percent (1% == 100, 100%= 10,000) of maximum cpu usage; exceeding this triggers congestion handling uint64_t max_block_net_usage; ///< the maxiumum net usage in instructions for a block - int target_block_net_usage_pct; ///< the target percent (1% == 100, 100%= 10,000) of maximum net usage; exceeding this triggers congestion handling + uint32_t target_block_net_usage_pct; ///< the target percent (1% == 100, 100%= 10,000) of maximum net usage; exceeding this triggers congestion handling uint32_t max_transaction_lifetime; uint32_t max_transaction_exec_time; -- GitLab