diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-02-24 17:15:10 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-02-24 17:15:10 +0800 |
| commit | e8c84bdf56f811f9ede1f9d1c797961ae5765a7e (patch) | |
| tree | 6c1ac9caf60f872101f174cd58d5cbac6de2ea5c | |
| parent | e48576ada32edf3e68ab025c867c0b73dfde2950 (diff) | |
| parent | 6e2d856d852e859382fe6b763d988ca4e3a84752 (diff) | |
| download | tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.tar tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.tar.gz tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.tar.bz2 tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.tar.lz tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.tar.xz tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.tar.zst tangerine-tests-e8c84bdf56f811f9ede1f9d1c797961ae5765a7e.zip | |
Merge remote-tracking branch 'origin/develop' into develop
| -rw-r--r-- | BasicTests/crypto.json | 8 | ||||
| -rw-r--r-- | BlockchainTests/badBlockChain.json | 10 | ||||
| -rw-r--r-- | BlockchainTests/basicBlockChain.json | 10 |
3 files changed, 28 insertions, 0 deletions
diff --git a/BasicTests/crypto.json b/BasicTests/crypto.json new file mode 100644 index 000000000..4ff65b682 --- /dev/null +++ b/BasicTests/crypto.json @@ -0,0 +1,8 @@ +[ + { + "decryption_type": "aes_ctr", + "key": "abb51256c1324a1350598653f46aa3ad693ac3cf5d05f36eba3f495a1f51590f", + "cipher": "84a727bc81fa4b13947dc9728b88fd08", + "payload": "000102030405060708090a0b0c0d0e0f" + } +] diff --git a/BlockchainTests/badBlockChain.json b/BlockchainTests/badBlockChain.json index ac1ffa806..78c5e8c49 100644 --- a/BlockchainTests/badBlockChain.json +++ b/BlockchainTests/badBlockChain.json @@ -1,5 +1,15 @@ { "lastBlock": "0c2b92f68a67487074ba0f9ba508c191e36a9248a297d9868901e09e58c93d83", + "allotment": { + "dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": "1606938044258990275541962092341162602522202993782792835301376", + "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", + "b9c015918bdaba24b4ff057a92a3873d6eb201be": "1606938044258990275541962092341162602522202993782792835301376", + "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", + "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", + "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", + "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" + }, "blockchain": [{ "header": { "parentHash": "efb4db878627027c81b3bb1c7dd3a18dae3914a49cdd24a3e40ab3bbfbb240c5", diff --git a/BlockchainTests/basicBlockChain.json b/BlockchainTests/basicBlockChain.json index 3ce1fc277..8d06a4dac 100644 --- a/BlockchainTests/basicBlockChain.json +++ b/BlockchainTests/basicBlockChain.json @@ -1,5 +1,15 @@ { "lastBlock": "9d0a03fd264306a8ccf624bbd52430c18016dd734f982f8e15a94e27c6a252d5", + "allotment": { + "dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": "1606938044258990275541962092341162602522202993782792835301376", + "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", + "b9c015918bdaba24b4ff057a92a3873d6eb201be": "1606938044258990275541962092341162602522202993782792835301376", + "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", + "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", + "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", + "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" + }, "blockchain": [{ "header": { "parentHash": "efb4db878627027c81b3bb1c7dd3a18dae3914a49cdd24a3e40ab3bbfbb240c5", |