Skip to content

Commit

Permalink
Rename crate imports to cometbft*
Browse files Browse the repository at this point in the history
Bulk search-and-replace changes.
  • Loading branch information
mzabaluev committed Dec 10, 2023
1 parent 4847083 commit 488991e
Show file tree
Hide file tree
Showing 168 changed files with 523 additions and 528 deletions.
14 changes: 7 additions & 7 deletions cometbft/src/abci/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ impl Event {
/// trait allow ergonomic event construction, as in this example:
///
/// ```
/// use tendermint::abci::{Event, EventAttributeIndexExt};
/// use cometbft::abci::{Event, EventAttributeIndexExt};
///
/// let event = Event::new(
/// "app",
Expand Down Expand Up @@ -206,8 +206,8 @@ mod v0_34 {
use crate::prelude::*;
use core::convert::{TryFrom, TryInto};

use tendermint_proto::v0_34::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34::abci as pb;
use cometbft_proto::Protobuf;

impl From<EventAttribute> for pb::EventAttribute {
fn from(event: EventAttribute) -> Self {
Expand Down Expand Up @@ -268,8 +268,8 @@ mod v0_37 {
use crate::prelude::*;
use core::convert::{TryFrom, TryInto};

use tendermint_proto::v0_37::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37::abci as pb;
use cometbft_proto::Protobuf;

impl From<EventAttribute> for pb::EventAttribute {
fn from(event: EventAttribute) -> Self {
Expand Down Expand Up @@ -327,8 +327,8 @@ mod v0_38 {
use crate::prelude::*;
use core::convert::{TryFrom, TryInto};

use tendermint_proto::v0_38::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38::abci as pb;
use cometbft_proto::Protobuf;

impl From<EventAttribute> for pb::EventAttribute {
fn from(event: EventAttribute) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/request/begin_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pub struct BeginBlock {
mod v0_34 {
use super::BeginBlock;
use crate::Error;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<BeginBlock> for pb::abci::RequestBeginBlock {
fn from(begin_block: BeginBlock) -> Self {
Expand Down Expand Up @@ -80,8 +80,8 @@ mod v0_34 {
mod v0_37 {
use super::BeginBlock;
use crate::Error;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<BeginBlock> for pb::abci::RequestBeginBlock {
fn from(begin_block: BeginBlock) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/request/deliver_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ pub struct DeliverTx {

mod v0_34 {
use super::DeliverTx;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<DeliverTx> for pb::abci::RequestDeliverTx {
fn from(deliver_tx: DeliverTx) -> Self {
Expand All @@ -37,8 +37,8 @@ mod v0_34 {

mod v0_37 {
use super::DeliverTx;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<DeliverTx> for pb::abci::RequestDeliverTx {
fn from(deliver_tx: DeliverTx) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/request/end_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ pub struct EndBlock {

mod v0_34 {
use super::EndBlock;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<EndBlock> for pb::abci::RequestEndBlock {
fn from(end_block: EndBlock) -> Self {
Expand All @@ -39,8 +39,8 @@ mod v0_34 {

mod v0_37 {
use super::EndBlock;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<EndBlock> for pb::abci::RequestEndBlock {
fn from(end_block: EndBlock) -> Self {
Expand Down
4 changes: 2 additions & 2 deletions cometbft/src/abci/request/extend_vote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ pub struct ExtendVote {
mod v0_38 {
use super::ExtendVote;
use crate::{prelude::*, Error};
use tendermint_proto::v0_38 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38 as pb;
use cometbft_proto::Protobuf;

impl From<ExtendVote> for pb::abci::RequestExtendVote {
fn from(extend_vote: ExtendVote) -> Self {
Expand Down
4 changes: 2 additions & 2 deletions cometbft/src/abci/request/finalize_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pub struct FinalizeBlock {
mod v0_38 {
use super::FinalizeBlock;
use crate::Error;
use tendermint_proto::v0_38 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38 as pb;
use cometbft_proto::Protobuf;

impl From<FinalizeBlock> for pb::abci::RequestFinalizeBlock {
fn from(value: FinalizeBlock) -> Self {
Expand Down
12 changes: 6 additions & 6 deletions cometbft/src/abci/request/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pub struct Info {

mod v0_34 {
use super::Info;
use tendermint_proto::v0_34::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34::abci as pb;
use cometbft_proto::Protobuf;

impl From<Info> for pb::RequestInfo {
fn from(info: Info) -> Self {
Expand Down Expand Up @@ -50,8 +50,8 @@ mod v0_34 {

mod v0_37 {
use super::Info;
use tendermint_proto::v0_37::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37::abci as pb;
use cometbft_proto::Protobuf;

impl From<Info> for pb::RequestInfo {
fn from(info: Info) -> Self {
Expand Down Expand Up @@ -82,8 +82,8 @@ mod v0_37 {

mod v0_38 {
use super::Info;
use tendermint_proto::v0_38::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38::abci as pb;
use cometbft_proto::Protobuf;

impl From<Info> for pb::RequestInfo {
fn from(info: Info) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/request/prepare_proposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ pub struct PrepareProposal {
mod v0_37 {
use super::PrepareProposal;
use crate::{prelude::*, Error};
use tendermint_proto::v0_37::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37::abci as pb;
use cometbft_proto::Protobuf;

impl From<PrepareProposal> for pb::RequestPrepareProposal {
fn from(value: PrepareProposal) -> Self {
Expand Down Expand Up @@ -82,8 +82,8 @@ mod v0_37 {
mod v0_38 {
use super::PrepareProposal;
use crate::{prelude::*, Error};
use tendermint_proto::v0_38::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38::abci as pb;
use cometbft_proto::Protobuf;

impl From<PrepareProposal> for pb::RequestPrepareProposal {
fn from(value: PrepareProposal) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/request/process_proposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ pub struct ProcessProposal {
mod v0_37 {
use super::ProcessProposal;
use crate::{prelude::*, Error};
use tendermint_proto::v0_37::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37::abci as pb;
use cometbft_proto::Protobuf;

impl From<ProcessProposal> for pb::RequestProcessProposal {
fn from(value: ProcessProposal) -> Self {
Expand Down Expand Up @@ -81,8 +81,8 @@ mod v0_37 {
mod v0_38 {
use super::ProcessProposal;
use crate::{prelude::*, Error};
use tendermint_proto::v0_38::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38::abci as pb;
use cometbft_proto::Protobuf;

impl From<ProcessProposal> for pb::RequestProcessProposal {
fn from(value: ProcessProposal) -> Self {
Expand Down
4 changes: 2 additions & 2 deletions cometbft/src/abci/request/set_option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ pub struct SetOption {

// The SetOption request has been removed after 0.34.

use tendermint_proto::v0_34::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34::abci as pb;
use cometbft_proto::Protobuf;

impl From<SetOption> for pb::RequestSetOption {
fn from(message: SetOption) -> Self {
Expand Down
4 changes: 2 additions & 2 deletions cometbft/src/abci/request/verify_vote_extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ pub struct VerifyVoteExtension {

mod v0_38 {
use super::VerifyVoteExtension;
use tendermint_proto::v0_38 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38 as pb;
use cometbft_proto::Protobuf;

impl From<VerifyVoteExtension> for pb::abci::RequestVerifyVoteExtension {
fn from(value: VerifyVoteExtension) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/response/begin_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ pub struct BeginBlock {

mod v0_34 {
use super::BeginBlock;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<BeginBlock> for pb::abci::ResponseBeginBlock {
fn from(begin_block: BeginBlock) -> Self {
Expand Down Expand Up @@ -46,8 +46,8 @@ mod v0_34 {

mod v0_37 {
use super::BeginBlock;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<BeginBlock> for pb::abci::ResponseBeginBlock {
fn from(begin_block: BeginBlock) -> Self {
Expand Down
12 changes: 6 additions & 6 deletions cometbft/src/abci/response/check_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ pub struct CheckTx {

mod v0_34 {
use super::CheckTx;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<CheckTx> for pb::abci::ResponseCheckTx {
fn from(check_tx: CheckTx) -> Self {
Expand Down Expand Up @@ -103,8 +103,8 @@ mod v0_34 {

mod v0_37 {
use super::CheckTx;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<CheckTx> for pb::abci::ResponseCheckTx {
fn from(check_tx: CheckTx) -> Self {
Expand Down Expand Up @@ -153,8 +153,8 @@ mod v0_37 {

mod v0_38 {
use super::CheckTx;
use tendermint_proto::v0_38 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38 as pb;
use cometbft_proto::Protobuf;

impl From<CheckTx> for pb::abci::ResponseCheckTx {
fn from(check_tx: CheckTx) -> Self {
Expand Down
12 changes: 6 additions & 6 deletions cometbft/src/abci/response/commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pub struct Commit {

mod v0_34 {
use super::Commit;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<Commit> for pb::abci::ResponseCommit {
fn from(commit: Commit) -> Self {
Expand All @@ -46,8 +46,8 @@ mod v0_34 {

mod v0_37 {
use super::Commit;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<Commit> for pb::abci::ResponseCommit {
fn from(commit: Commit) -> Self {
Expand All @@ -74,8 +74,8 @@ mod v0_37 {

mod v0_38 {
use super::Commit;
use tendermint_proto::v0_38 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38 as pb;
use cometbft_proto::Protobuf;

impl From<Commit> for pb::abci::ResponseCommit {
fn from(commit: Commit) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/response/deliver_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ pub struct DeliverTx {

mod v0_34 {
use super::DeliverTx;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<DeliverTx> for pb::abci::ResponseDeliverTx {
fn from(deliver_tx: DeliverTx) -> Self {
Expand Down Expand Up @@ -83,8 +83,8 @@ mod v0_34 {

mod v0_37 {
use super::DeliverTx;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<DeliverTx> for pb::abci::ResponseDeliverTx {
fn from(deliver_tx: DeliverTx) -> Self {
Expand Down
8 changes: 4 additions & 4 deletions cometbft/src/abci/response/end_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ pub struct EndBlock {

mod v0_34 {
use super::EndBlock;
use tendermint_proto::v0_34 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_34 as pb;
use cometbft_proto::Protobuf;

impl From<EndBlock> for pb::abci::ResponseEndBlock {
fn from(end_block: EndBlock) -> Self {
Expand Down Expand Up @@ -68,8 +68,8 @@ mod v0_34 {

mod v0_37 {
use super::EndBlock;
use tendermint_proto::v0_37 as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_37 as pb;
use cometbft_proto::Protobuf;

impl From<EndBlock> for pb::abci::ResponseEndBlock {
fn from(end_block: EndBlock) -> Self {
Expand Down
4 changes: 2 additions & 2 deletions cometbft/src/abci/response/extend_vote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pub struct ExtendVote {

mod v0_38 {
use super::ExtendVote;
use tendermint_proto::v0_38::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38::abci as pb;
use cometbft_proto::Protobuf;

impl From<ExtendVote> for pb::ResponseExtendVote {
fn from(value: ExtendVote) -> Self {
Expand Down
4 changes: 2 additions & 2 deletions cometbft/src/abci/response/finalize_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ pub struct FinalizeBlock {

mod v0_38 {
use super::FinalizeBlock;
use tendermint_proto::v0_38::abci as pb;
use tendermint_proto::Protobuf;
use cometbft_proto::v0_38::abci as pb;
use cometbft_proto::Protobuf;

impl From<FinalizeBlock> for pb::ResponseFinalizeBlock {
fn from(value: FinalizeBlock) -> Self {
Expand Down
2 changes: 1 addition & 1 deletion cometbft/src/abci/response/info.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{block, prelude::*, AppHash};
use tendermint_proto::v0_37::abci as pb;
use cometbft_proto::v0_37::abci as pb;

use serde::{Deserialize, Serialize};

Expand Down
Loading

0 comments on commit 488991e

Please sign in to comment.