diff --git a/shared_model/backend/protobuf/queries/impl/proto_tx_pagination_meta.cpp b/shared_model/backend/protobuf/queries/impl/proto_tx_pagination_meta.cpp index 39faa37b4f9..db9d91a0f40 100644 --- a/shared_model/backend/protobuf/queries/impl/proto_tx_pagination_meta.cpp +++ b/shared_model/backend/protobuf/queries/impl/proto_tx_pagination_meta.cpp @@ -75,26 +75,26 @@ std::optional TxPaginationMeta::lastTxHeight() const { return types::HeightType(meta_.last_tx_height()); } //trans_text -std::optional TxPaginationMeta::transText() const { - if (meta_.opt_trans_text_case() - == iroha::protocol::TxPaginationMeta::OptTransTextCase::OPT_TRANS_TEXT_NOT_SET) { +std::optional TxPaginationMeta::txText() const { + if (meta_.opt_tx_text_case() + == iroha::protocol::TxPaginationMeta::OptTxTextCase::OPT_TX_TEXT_NOT_SET) { return std::nullopt; } - return types::HeightType(meta_.trans_text()); + return types::HeightType(meta_.tx_text()); } //trans_account -std::optional TxPaginationMeta::transAccount() const { - if (meta_.opt_trans_account_case() - == iroha::protocol::TxPaginationMeta::OptTransAccountCase::OPT_TRANS_ACCOUNT_NOT_SET) { +std::optional TxPaginationMeta::txAccount() const { + if (meta_.opt_tx_account_case() + == iroha::protocol::TxPaginationMeta::OptTxAccountCase::OPT_TX_ACCOUNT_NOT_SET) { return std::nullopt; } - return types::HeightType(meta_.trans_account()); + return types::HeightType(meta_.tx_account()); } //trans_sent_from_account -std::optional TxPaginationMeta::transSentFromAccount() const { - if (meta_.opt_trans_sent_from_account_case() - == iroha::protocol::TxPaginationMeta::OptTransSentFromAccountCase::OPT_TRANS_SENT_FROM_ACCOUNT_NOT_SET) { +std::optional TxPaginationMeta::txSentFromAccount() const { + if (meta_.opt_tx_sent_from_account_case() + == iroha::protocol::TxPaginationMeta::OptTxSentFromAccountCase::OPT_TX_SENT_FROM_ACCOUNT_NOT_SET) { return std::nullopt; } - return types::HeightType(meta_.trans_sent_from_account()); -} + return types::HeightType(meta_.tx_sent_from_account()); +} \ No newline at end of file diff --git a/shared_model/backend/protobuf/queries/proto_tx_pagination_meta.hpp b/shared_model/backend/protobuf/queries/proto_tx_pagination_meta.hpp index fc959847590..2a96ab535ac 100644 --- a/shared_model/backend/protobuf/queries/proto_tx_pagination_meta.hpp +++ b/shared_model/backend/protobuf/queries/proto_tx_pagination_meta.hpp @@ -31,9 +31,9 @@ namespace shared_model { const override; std::optional lastTxHeight() const override; - std::optional transText() const override; - std::optional transAccount() const override; - std::optional transSentFromAccount() + std::optional txText() const override; + std::optional txAccount() const override; + std::optional txSentFromAccount() const override; private: const iroha::protocol::TxPaginationMeta &meta_; diff --git a/shared_model/interfaces/queries/tx_pagination_meta.hpp b/shared_model/interfaces/queries/tx_pagination_meta.hpp index c14c9c5ef75..20c6f1c23bc 100644 --- a/shared_model/interfaces/queries/tx_pagination_meta.hpp +++ b/shared_model/interfaces/queries/tx_pagination_meta.hpp @@ -28,9 +28,9 @@ namespace shared_model { virtual std::optional lastTxTime() const = 0; virtual std::optional firstTxHeight() const = 0; virtual std::optional lastTxHeight() const = 0; - virtual std::optional transText() const = 0; - virtual std::optional transAccount() const = 0; - virtual std::optional transSentFromAccount() const = 0; + virtual std::optional txText() const = 0; + virtual std::optional txAccount() const = 0; + virtual std::optional txSentFromAccount() const = 0; std::string toString() const override; bool operator==(const ModelType &rhs) const override; diff --git a/shared_model/schema/queries.proto b/shared_model/schema/queries.proto index fda2587d458..344d03fe534 100644 --- a/shared_model/schema/queries.proto +++ b/shared_model/schema/queries.proto @@ -46,14 +46,14 @@ message TxPaginationMeta { oneof opt_last_tx_height { uint64 last_tx_height = 7; } - oneof opt_trans_text{ - uint64 trans_text = 8; + oneof opt_tx_text{ + uint64 tx_text = 8; } - oneof opt_trans_account{ - uint64 trans_account = 9; + oneof opt_tx_account{ + uint64 tx_account = 9; } - oneof opt_trans_sent_from_account{ - uint64 trans_sent_from_account = 10; + oneof opt_tx_sent_from_account{ + uint64 tx_sent_from_account = 10; } }