From 8537dd60e6341474967f8e9d04a7b7f6a060ec36 Mon Sep 17 00:00:00 2001 From: EmelyanenkoK Date: Mon, 13 Jun 2022 20:02:32 +0300 Subject: [PATCH] Fix tests (#405) * [tonlib] Update master configs and fix test-tonlib-offline * Fix test-bigint in release build Co-authored-by: ms <98183742+dungeon-master-666@users.noreply.github.com> Co-authored-by: dungeon-master-666 --- crypto/test/modbigint.cpp | 8 +- tonlib/test/offline.cpp | 123 ++++++++++++++------------- tonlib/tonlib/TonlibClient.cpp | 148 ++++++++++++--------------------- 3 files changed, 124 insertions(+), 155 deletions(-) diff --git a/crypto/test/modbigint.cpp b/crypto/test/modbigint.cpp index 851f0f9b..b6480d38 100644 --- a/crypto/test/modbigint.cpp +++ b/crypto/test/modbigint.cpp @@ -786,7 +786,9 @@ struct ModArray { } ModArray& operator/=(const ModArray& other) { - assert(try_divide(other) && "division by zero?"); + if (!try_divide(other)) { + assert(false); // division by zero? + } return *this; } @@ -1051,7 +1053,9 @@ void init_invm() { for (int i = 0; i < mod_cnt; i++) { assert(mod[i] > 0 && mod[i] <= (1 << 30)); for (int j = 0; j < i; j++) { - assert(gcdx(mod[i], mod[j], invm[i][j], invm[j][i]) == 1); + if (gcdx(mod[i], mod[j], invm[i][j], invm[j][i]) != 1) { + assert(false); + } if (invm[i][j] < 0) { invm[i][j] += mod[j]; } diff --git a/tonlib/test/offline.cpp b/tonlib/test/offline.cpp index 634aacf3..a1e5a0f6 100644 --- a/tonlib/test/offline.cpp +++ b/tonlib/test/offline.cpp @@ -575,83 +575,92 @@ TEST(Tonlib, ConfigCache) { nullptr, make_object("testdir")))) .ensure(); + auto mainnet = R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "F6OpKZKqvqeFp6CQmFomXNMfMj2EnaUSOXN+Mh+wVWk=", + "file_hash": "XplPz01CXAps5qeSWUtxcyBfdAo5zVb1N979KLSKD24=" + }, + "hardforks": [ + { + "file_hash": "t/9VBPODF7Zdh4nsnA49dprO69nQNMqYL+zk5bCjV/8=", + "seqno": 8536841, + "root_hash": "08Kpc9XxrMKC6BF/FeNHPS3MEL1/Vi/fQU/C9ELUrkc=", + "workchain": -1, + "shard": -9223372036854775808 + } + ] + } + })abc"; auto testnet = R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "workchain": -1, - "shard": -9223372036854775808, - "seqno": 0, - "root_hash": "VCSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=", - "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "gj+B8wb/AmlPk1z1AhVI484rhrUpgSr2oSFIh56VoSg=", + "file_hash": "Z+IKwYS54DmmJmesw/nAD5DzWadnOCMzee+kdgSYDOg=" + } } - } -})abc"; - auto testnet2 = R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "workchain": -1, - "shard": -9223372036854775808, - "seqno": 0, - "root_hash": "F6OpKZKqvqeFp6CQmFomXNMfMj2EnaUSOXN+Mh+wVWk=", - "file_hash": "XplPz01CXAps5qeSWUtxcyBfdAo5zVb1N979KLSKD24=" + })abc"; + auto custom = R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "ZXSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=", + "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + } } - } -})abc"; - auto testnet3 = R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "workchain": -1, - "shard": -9223372036854775808, - "seqno": 0, - "root_hash": "ZXSXxDHhTALFxReyTZRd8E4Ya3ySOmpOWAS4rBX9XBY=", - "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" - } - } -})abc"; + })abc"; auto bad = R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "workchain": -1, - "shard": -9223372036854775808, - "seqno": 0, - "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "file_hash": "eh9yveSz1qMdJ7mOsO+I+H77jkLr9NpAuEkoJuseXBo=" + } } - } -})abc"; + })abc"; sync_send(client, make_object(make_object(bad, "", true, false))) .ensure_error(); + sync_send(client, + make_object(make_object(mainnet, "", true, false))) + .ensure(); sync_send(client, make_object(make_object(testnet, "", true, false))) .ensure(); sync_send(client, - make_object(make_object(testnet2, "", true, false))) - .ensure(); - sync_send(client, - make_object(make_object(testnet3, "", true, false))) + make_object(make_object(custom, "", true, false))) .ensure(); sync_send(client, make_object( - make_object(testnet2, "testnet", true, false))) + make_object(mainnet, "testnet", true, false))) .ensure_error(); sync_send(client, make_object( - make_object(testnet2, "testnet2", true, false))) + make_object(testnet, "testnet", true, false))) .ensure(); sync_send(client, make_object( - make_object(testnet3, "testnet2", true, false))) + make_object(custom, "testnet", true, false))) .ensure_error(); } diff --git a/tonlib/tonlib/TonlibClient.cpp b/tonlib/tonlib/TonlibClient.cpp index 2696bb1a..26881fc1 100644 --- a/tonlib/tonlib/TonlibClient.cpp +++ b/tonlib/tonlib/TonlibClient.cpp @@ -1939,103 +1939,59 @@ class MasterConfig { const MasterConfig& get_default_master_config() { static MasterConfig config = [] { MasterConfig res; - res.add_config("testnet", R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "file_hash": "BzgfRpFgyNjHI7aR5KQhq4Wtr2wN+sXzLaW+rfHvP5A=", - "seqno": 0, - "root_hash": "WPsS1IiRjT0MSD6Xvys4QYQh7rrc9x0ybzXojwJ4gH0=", - "workchain": -1, - "shard": -9223372036854775808 - }, - "init_block":{ - "file_hash":"CXvKA37GFugspx6U7sv4Sh7KIVqR1R+Pj4AmGx2Ezi0=", - "seqno":2908533, - "root_hash":"oFi1uMHmELXV/AfjuvTZREmRY7TtNgq608sFjnRJCAo=", - "workchain":-1, - "shard":-9223372036854775808 - }, - "hardforks":[ - { - "file_hash":"x97xobbkPDggz7/u6KQzlT3pBmM5XfGE6vN7AiuTMU0=", - "seqno":1907338, - "root_hash":"BuZOCJvbg0ys2JBnfocqCf1T4rt0OzLLslOG3CjcSgU=", - "workchain":-1, - "shard":-9223372036854775808 - }, - { - "file_hash": "CXvKA37GFugspx6U7sv4Sh7KIVqR1R+Pj4AmGx2Ezi0=", - "seqno": 2908533, - "root_hash": "oFi1uMHmELXV/AfjuvTZREmRY7TtNgq608sFjnRJCAo=", - "workchain": -1, - "shard": -9223372036854775808 - } - ] - } -})abc"); res.add_config("mainnet", R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "workchain": -1, - "shard": -9223372036854775808, - "seqno": 0, - "root_hash": "F6OpKZKqvqeFp6CQmFomXNMfMj2EnaUSOXN+Mh+wVWk=", - "file_hash": "XplPz01CXAps5qeSWUtxcyBfdAo5zVb1N979KLSKD24=" - }, - "init_block" : { - "root_hash": "irEt9whDfgaYwD+8AzBlYzrMZHhrkhSVp3PU1s4DOz4=", - "seqno": 10171687, - "file_hash": "lay/bUKUUFDJXU9S6gx9GACQFl+uK+zX8SqHWS9oLZc=", - "workchain": -1, - "shard": -9223372036854775808 - }, - "hardforks": [ - { - "file_hash": "t/9VBPODF7Zdh4nsnA49dprO69nQNMqYL+zk5bCjV/8=", - "seqno": 8536841, - "root_hash": "08Kpc9XxrMKC6BF/FeNHPS3MEL1/Vi/fQU/C9ELUrkc=", - "workchain": -1, - "shard": -9223372036854775808 - } - ] - } -})abc"); - res.add_config("testnet2", R"abc({ - "liteservers": [ - ], - "validator": { - "@type": "validator.config.global", - "zero_state": { - "workchain": -1, - "shard": -9223372036854775808, - "seqno": 0, - "root_hash": "F6OpKZKqvqeFp6CQmFomXNMfMj2EnaUSOXN+Mh+wVWk=", - "file_hash": "XplPz01CXAps5qeSWUtxcyBfdAo5zVb1N979KLSKD24=" - }, - "init_block" : { - "root_hash": "irEt9whDfgaYwD+8AzBlYzrMZHhrkhSVp3PU1s4DOz4=", - "seqno": 10171687, - "file_hash": "lay/bUKUUFDJXU9S6gx9GACQFl+uK+zX8SqHWS9oLZc=", - "workchain": -1, - "shard": -9223372036854775808 - }, - "hardforks": [ - { - "file_hash": "t/9VBPODF7Zdh4nsnA49dprO69nQNMqYL+zk5bCjV/8=", - "seqno": 8536841, - "root_hash": "08Kpc9XxrMKC6BF/FeNHPS3MEL1/Vi/fQU/C9ELUrkc=", - "workchain": -1, - "shard": -9223372036854775808 - } - ] - } -})abc"); + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "F6OpKZKqvqeFp6CQmFomXNMfMj2EnaUSOXN+Mh+wVWk=", + "file_hash": "XplPz01CXAps5qeSWUtxcyBfdAo5zVb1N979KLSKD24=" + }, + "init_block" : { + "root_hash": "irEt9whDfgaYwD+8AzBlYzrMZHhrkhSVp3PU1s4DOz4=", + "seqno": 10171687, + "file_hash": "lay/bUKUUFDJXU9S6gx9GACQFl+uK+zX8SqHWS9oLZc=", + "workchain": -1, + "shard": -9223372036854775808 + }, + "hardforks": [ + { + "file_hash": "t/9VBPODF7Zdh4nsnA49dprO69nQNMqYL+zk5bCjV/8=", + "seqno": 8536841, + "root_hash": "08Kpc9XxrMKC6BF/FeNHPS3MEL1/Vi/fQU/C9ELUrkc=", + "workchain": -1, + "shard": -9223372036854775808 + } + ] + } + })abc"); + res.add_config("testnet", R"abc({ + "liteservers": [ + ], + "validator": { + "@type": "validator.config.global", + "zero_state": { + "workchain": -1, + "shard": -9223372036854775808, + "seqno": 0, + "root_hash": "gj+B8wb/AmlPk1z1AhVI484rhrUpgSr2oSFIh56VoSg=", + "file_hash": "Z+IKwYS54DmmJmesw/nAD5DzWadnOCMzee+kdgSYDOg=" + }, + "init_block" : { + "root_hash": "gj+B8wb/AmlPk1z1AhVI484rhrUpgSr2oSFIh56VoSg=", + "seqno": 0, + "file_hash": "Z+IKwYS54DmmJmesw/nAD5DzWadnOCMzee+kdgSYDOg=", + "workchain": -1, + "shard": -9223372036854775808 + }, + "hardforks": [ + ] + } + })abc"); return res; }(); return config;