QPQ-AG/gmserialization
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Pt 164596045 align to aeternity master #14

Merged
gorillainduction merged 2 commits from PT-164596045-align-to-aeternity-master into master 2019-03-13 23:58:53 +09:00
Conversation 4 Commits 2 Files Changed 1 +84 -68
1 changed files with 84 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/aeser_api_encoder.erl
View File

@ -19,7 +19,10 @@
| block_tx_hash | block_tx_hash
| block_state_hash | block_state_hash
| channel | channel
| contract_bytearray
| contract_pubkey | contract_pubkey
| contract_store_key
| contract_store_value
| transaction | transaction
| tx_hash | tx_hash
| oracle_pubkey | oracle_pubkey
@ -33,7 +36,8 @@
| peer_pubkey | peer_pubkey
| state | state
| poi | poi
| state_trees. | state_trees
| call_state_tree.
-type extended_type() :: known_type() | block_hash | {id_hash, [known_type()]}. -type extended_type() :: known_type() | block_hash | {id_hash, [known_type()]}.
@ -176,7 +180,9 @@ type2enc(block_tx_hash) -> ?BASE58;
type2enc(block_state_hash) -> ?BASE58; type2enc(block_state_hash) -> ?BASE58;
type2enc(channel) -> ?BASE58; type2enc(channel) -> ?BASE58;
type2enc(contract_pubkey) -> ?BASE58; type2enc(contract_pubkey) -> ?BASE58;
type2enc(contract_bytearray)-> ?BASE64; type2enc(contract_bytearray) -> ?BASE64;
type2enc(contract_store_key) -> ?BASE64;
type2enc(contract_store_value) -> ?BASE64;
type2enc(transaction) -> ?BASE64; type2enc(transaction) -> ?BASE64;
type2enc(tx_hash) -> ?BASE58; type2enc(tx_hash) -> ?BASE58;
type2enc(oracle_pubkey) -> ?BASE58; type2enc(oracle_pubkey) -> ?BASE58;
@ -190,7 +196,8 @@ type2enc(peer_pubkey) -> ?BASE58;
type2enc(name) -> ?BASE58; type2enc(name) -> ?BASE58;
type2enc(state) -> ?BASE64; type2enc(state) -> ?BASE64;
type2enc(poi) -> ?BASE64; type2enc(poi) -> ?BASE64;
type2enc(state_trees) -> ?BASE64. type2enc(state_trees) -> ?BASE64;
type2enc(call_state_tree) -> ?BASE64.
type2pfx(key_block_hash) -> <<"kh">>; type2pfx(key_block_hash) -> <<"kh">>;
@ -200,7 +207,9 @@ type2pfx(block_tx_hash) -> <<"bx">>;
type2pfx(block_state_hash) -> <<"bs">>; type2pfx(block_state_hash) -> <<"bs">>;
type2pfx(channel) -> <<"ch">>; type2pfx(channel) -> <<"ch">>;
type2pfx(contract_pubkey) -> <<"ct">>; type2pfx(contract_pubkey) -> <<"ct">>;
type2pfx(contract_bytearray)-> <<"cb">>; type2pfx(contract_bytearray) -> <<"cb">>;
type2pfx(contract_store_key) -> <<"ck">>;
type2pfx(contract_store_value) -> <<"cv">>;
type2pfx(transaction) -> <<"tx">>; type2pfx(transaction) -> <<"tx">>;
type2pfx(tx_hash) -> <<"th">>; type2pfx(tx_hash) -> <<"th">>;
type2pfx(oracle_pubkey) -> <<"ok">>; type2pfx(oracle_pubkey) -> <<"ok">>;
@ -214,7 +223,8 @@ type2pfx(peer_pubkey) -> <<"pp">>;
type2pfx(name) -> <<"nm">>; type2pfx(name) -> <<"nm">>;
type2pfx(state) -> <<"st">>; type2pfx(state) -> <<"st">>;
type2pfx(poi) -> <<"pi">>; type2pfx(poi) -> <<"pi">>;
type2pfx(state_trees) -> <<"ss">>. type2pfx(state_trees) -> <<"ss">>;
type2pfx(call_state_tree) -> <<"cs">>.
pfx2type(<<"kh">>) -> key_block_hash; pfx2type(<<"kh">>) -> key_block_hash;
pfx2type(<<"mh">>) -> micro_block_hash; pfx2type(<<"mh">>) -> micro_block_hash;
@ -223,6 +233,8 @@ pfx2type(<<"bx">>) -> block_tx_hash;
pfx2type(<<"bs">>) -> block_state_hash; pfx2type(<<"bs">>) -> block_state_hash;
pfx2type(<<"ch">>) -> channel; pfx2type(<<"ch">>) -> channel;
pfx2type(<<"cb">>) -> contract_bytearray; pfx2type(<<"cb">>) -> contract_bytearray;
pfx2type(<<"ck">>) -> contract_store_key;
pfx2type(<<"cv">>) -> contract_store_value;
pfx2type(<<"ct">>) -> contract_pubkey; pfx2type(<<"ct">>) -> contract_pubkey;
pfx2type(<<"tx">>) -> transaction; pfx2type(<<"tx">>) -> transaction;
pfx2type(<<"th">>) -> tx_hash; pfx2type(<<"th">>) -> tx_hash;
@ -237,7 +249,8 @@ pfx2type(<<"pp">>) -> peer_pubkey;
pfx2type(<<"nm">>) -> name; pfx2type(<<"nm">>) -> name;
pfx2type(<<"st">>) -> state; pfx2type(<<"st">>) -> state;
pfx2type(<<"pi">>) -> poi; pfx2type(<<"pi">>) -> poi;
pfx2type(<<"ss">>) -> state_trees. pfx2type(<<"ss">>) -> state_trees;
pfx2type(<<"cs">>) -> call_state_tree.
-spec byte_size_for_type(known_type()) -> non_neg_integer() | not_applicable. -spec byte_size_for_type(known_type()) -> non_neg_integer() | not_applicable.
@ -248,7 +261,9 @@ byte_size_for_type(block_tx_hash) -> 32;
byte_size_for_type(block_state_hash) -> 32; byte_size_for_type(block_state_hash) -> 32;
byte_size_for_type(channel) -> 32; byte_size_for_type(channel) -> 32;
byte_size_for_type(contract_pubkey) -> 32; byte_size_for_type(contract_pubkey) -> 32;
byte_size_for_type(contract_bytearray)-> not_applicable; byte_size_for_type(contract_bytearray) -> not_applicable;
byte_size_for_type(contract_store_key) -> not_applicable;
byte_size_for_type(contract_store_value) -> not_applicable;
byte_size_for_type(transaction) -> not_applicable; byte_size_for_type(transaction) -> not_applicable;
byte_size_for_type(tx_hash) -> 32; byte_size_for_type(tx_hash) -> 32;
byte_size_for_type(oracle_pubkey) -> 32; byte_size_for_type(oracle_pubkey) -> 32;
@ -262,7 +277,8 @@ byte_size_for_type(commitment) -> 32;
byte_size_for_type(peer_pubkey) -> 32; byte_size_for_type(peer_pubkey) -> 32;
byte_size_for_type(state) -> 32; byte_size_for_type(state) -> 32;
byte_size_for_type(poi) -> not_applicable; byte_size_for_type(poi) -> not_applicable;
byte_size_for_type(state_trees) -> not_applicable. byte_size_for_type(state_trees) -> not_applicable;
byte_size_for_type(call_state_tree) -> not_applicable.
%% TODO: Fix the base58 module so that it consistently uses binaries instead %% TODO: Fix the base58 module so that it consistently uses binaries instead