From c6a41110d1e8b6b993240df261d2a5e214866649ee5e67d2b735afb319f76902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mukan=20Erkin=20T=C3=B6r=C3=BCk?= Date: Mon, 11 May 2026 03:36:20 +0300 Subject: [PATCH] refactor: replace all github.com upstream refs with git.cw.tr/mukan-network --- abci/client/client.go | 6 +-- abci/client/grpc_client.go | 6 +-- abci/client/grpc_client_test.go | 8 ++-- abci/client/local_client.go | 6 +-- abci/client/mocks/client.go | 6 +-- abci/client/socket_client.go | 8 ++-- abci/client/socket_client_test.go | 10 ++-- abci/cmd/abci-cli/abci-cli.go | 18 +++---- abci/example/kvstore/helpers.go | 8 ++-- abci/example/kvstore/kvstore.go | 12 ++--- abci/example/kvstore/kvstore_test.go | 10 ++-- abci/server/grpc_server.go | 6 +-- abci/server/server.go | 4 +- abci/server/socket_server.go | 10 ++-- abci/tests/benchmarks/parallel/parallel.go | 4 +- abci/tests/benchmarks/simple/simple.go | 4 +- abci/tests/client_server_test.go | 6 +-- abci/tests/server/client.go | 6 +-- abci/types/messages.go | 2 +- abci/types/messages_test.go | 2 +- abci/types/mocks/application.go | 2 +- abci/types/pubkey.go | 6 +-- abci/types/types.pb.go | 4 +- abci/types/types_test.go | 4 +- abci/version/version.go | 2 +- blocksync/metrics.go | 2 +- blocksync/msgs.go | 6 +-- blocksync/msgs_test.go | 6 +-- blocksync/pool.go | 14 +++--- blocksync/pool_test.go | 8 ++-- blocksync/reactor.go | 14 +++--- blocksync/reactor_test.go | 28 +++++------ cmd/cometbft/commands/compact.go | 2 +- cmd/cometbft/commands/debug/debug.go | 2 +- cmd/cometbft/commands/debug/dump.go | 6 +-- cmd/cometbft/commands/debug/kill.go | 6 +-- cmd/cometbft/commands/debug/util.go | 4 +- cmd/cometbft/commands/gen_node_key.go | 4 +- cmd/cometbft/commands/gen_validator.go | 4 +- cmd/cometbft/commands/init.go | 14 +++--- cmd/cometbft/commands/inspect.go | 12 ++--- cmd/cometbft/commands/light.go | 18 +++---- cmd/cometbft/commands/reindex_event.go | 22 ++++----- cmd/cometbft/commands/reindex_event_test.go | 16 +++---- cmd/cometbft/commands/replay.go | 2 +- cmd/cometbft/commands/reset.go | 6 +-- cmd/cometbft/commands/reset_test.go | 4 +- cmd/cometbft/commands/rollback.go | 10 ++-- cmd/cometbft/commands/root.go | 8 ++-- cmd/cometbft/commands/root_test.go | 6 +-- cmd/cometbft/commands/run_node.go | 6 +-- cmd/cometbft/commands/show_node_id.go | 2 +- cmd/cometbft/commands/show_validator.go | 6 +-- cmd/cometbft/commands/testnet.go | 14 +++--- cmd/cometbft/commands/version.go | 2 +- cmd/cometbft/main.go | 10 ++-- cmd/priv_val_server/main.go | 10 ++-- config/config.go | 4 +- config/config_test.go | 2 +- config/db.go | 6 +-- config/toml.go | 2 +- config/toml_test.go | 4 +- consensus/byzantine_test.go | 30 ++++++------ consensus/common_test.go | 42 ++++++++-------- consensus/invalid_test.go | 16 +++---- consensus/mempool_test.go | 14 +++--- consensus/metrics.go | 6 +-- consensus/msgs.go | 14 +++--- consensus/msgs_test.go | 14 +++--- consensus/reactor.go | 24 +++++----- consensus/reactor_test.go | 48 +++++++++---------- consensus/replay.go | 12 ++--- consensus/replay_file.go | 16 +++---- consensus/replay_stubs.go | 10 ++-- consensus/replay_test.go | 32 ++++++------- consensus/state.go | 38 +++++++-------- consensus/state_test.go | 28 +++++------ consensus/ticker.go | 4 +- consensus/ticker_test.go | 2 +- consensus/types/height_vote_set.go | 10 ++-- consensus/types/height_vote_set_test.go | 14 +++--- consensus/types/peer_round_state.go | 4 +- consensus/types/round_state.go | 4 +- consensus/wal.go | 14 +++--- consensus/wal_generator.go | 22 ++++----- consensus/wal_test.go | 12 ++--- crypto/batch/batch.go | 6 +-- crypto/crypto.go | 6 +-- crypto/ed25519/bench_test.go | 4 +- crypto/ed25519/ed25519.go | 6 +-- crypto/ed25519/ed25519_test.go | 4 +- crypto/encoding/codec.go | 10 ++-- crypto/example_test.go | 2 +- crypto/internal/benchmarking/bench.go | 2 +- crypto/merkle/hash.go | 2 +- crypto/merkle/proof.go | 4 +- crypto/merkle/proof_op.go | 2 +- crypto/merkle/proof_test.go | 4 +- crypto/merkle/proof_value.go | 4 +- crypto/merkle/rfc6962_test.go | 2 +- crypto/merkle/tree_test.go | 6 +-- crypto/random_test.go | 2 +- crypto/secp256k1/secp256k1.go | 4 +- crypto/secp256k1/secp256k1_test.go | 4 +- crypto/sr25519/batch.go | 2 +- crypto/sr25519/bench_test.go | 4 +- crypto/sr25519/encoding.go | 2 +- crypto/sr25519/privkey.go | 2 +- crypto/sr25519/pubkey.go | 4 +- crypto/sr25519/sr25519_test.go | 4 +- crypto/tmhash/hash_test.go | 2 +- crypto/xsalsa20symmetric/symmetric.go | 2 +- crypto/xsalsa20symmetric/symmetric_test.go | 2 +- evidence/doc.go | 2 +- evidence/mocks/block_store.go | 2 +- evidence/pool.go | 12 ++--- evidence/pool_test.go | 22 ++++----- evidence/reactor.go | 10 ++-- evidence/reactor_test.go | 24 +++++----- evidence/services.go | 2 +- evidence/verify.go | 4 +- evidence/verify_test.go | 26 +++++----- inspect/inspect.go | 22 ++++----- inspect/inspect_test.go | 22 ++++----- inspect/rpc/rpc.go | 14 +++--- internal/indexer/indexer_utils.go | 2 +- internal/test/block.go | 8 ++-- internal/test/commit.go | 4 +- internal/test/config.go | 4 +- internal/test/factory_test.go | 2 +- internal/test/genesis.go | 2 +- internal/test/params.go | 2 +- internal/test/tx.go | 2 +- internal/test/validator.go | 2 +- libs/autofile/autofile.go | 2 +- libs/autofile/autofile_test.go | 2 +- libs/autofile/cmd/logjack.go | 4 +- libs/autofile/group.go | 2 +- libs/autofile/group_test.go | 4 +- libs/bits/bit_array.go | 6 +-- libs/bits/bit_array_test.go | 4 +- libs/cli/flags/log_level.go | 2 +- libs/cli/flags/log_level_test.go | 4 +- libs/clist/clist.go | 2 +- libs/clist/clist_test.go | 2 +- libs/cmap/cmap.go | 2 +- libs/events/events.go | 4 +- libs/events/events_test.go | 2 +- libs/flowrate/flowrate.go | 2 +- libs/json/decoder_test.go | 2 +- libs/json/encoder_test.go | 2 +- libs/json/helpers_test.go | 2 +- libs/json/structs.go | 2 +- libs/json/types.go | 2 +- libs/log/filter_test.go | 2 +- libs/log/lazy.go | 2 +- libs/log/tm_logger_test.go | 2 +- libs/log/tmfmt_logger_test.go | 2 +- libs/log/tracing_logger_test.go | 2 +- libs/os/os.go | 2 +- libs/protoio/io_test.go | 2 +- libs/pubsub/example_test.go | 6 +-- libs/pubsub/pubsub.go | 4 +- libs/pubsub/pubsub_test.go | 6 +-- libs/pubsub/query/bench_test.go | 2 +- libs/pubsub/query/query.go | 4 +- libs/pubsub/query/query_test.go | 10 ++-- libs/pubsub/query/syntax/syntax_test.go | 2 +- libs/pubsub/subscription.go | 2 +- libs/rand/random.go | 4 +- libs/service/service.go | 2 +- libs/tempfile/tempfile.go | 2 +- libs/tempfile/tempfile_test.go | 2 +- libs/test/mutate.go | 2 +- libs/timer/throttle_timer.go | 2 +- libs/timer/throttle_timer_test.go | 2 +- light/client.go | 14 +++--- light/client_benchmark_test.go | 12 ++--- light/client_test.go | 16 +++---- light/detector.go | 6 +-- light/detector_test.go | 14 +++--- light/doc.go | 4 +- light/errors.go | 2 +- light/example_test.go | 16 +++---- light/helpers_test.go | 16 +++---- light/provider/http/http.go | 10 ++-- light/provider/http/http_test.go | 14 +++--- light/provider/mock/deadmock.go | 4 +- light/provider/mock/mock.go | 4 +- light/provider/provider.go | 2 +- light/proxy/proxy.go | 12 ++--- light/proxy/routes.go | 14 +++--- light/rpc/client.go | 18 +++---- light/rpc/mocks/light_client.go | 2 +- light/setup.go | 6 +-- light/store/db/db.go | 10 ++-- light/store/db/db_test.go | 14 +++--- light/store/store.go | 2 +- light/trust_options.go | 2 +- light/verifier.go | 4 +- light/verifier_test.go | 6 +-- mempool/bench_test.go | 4 +- mempool/cache.go | 4 +- mempool/cache_test.go | 8 ++-- mempool/clist_mempool.go | 16 +++---- mempool/clist_mempool_test.go | 26 +++++----- mempool/ids.go | 4 +- mempool/ids_test.go | 2 +- mempool/mempool.go | 4 +- mempool/mempoolTx.go | 2 +- mempool/mocks/mempool.go | 6 +-- mempool/nop_mempool.go | 8 ++-- mempool/nop_mempool_test.go | 2 +- mempool/reactor.go | 12 ++--- mempool/reactor_test.go | 22 ++++----- mempool/tx.go | 2 +- node/node.go | 48 +++++++++---------- node/node_test.go | 36 +++++++------- node/setup.go | 46 +++++++++--------- p2p/base_reactor.go | 4 +- p2p/conn/conn_notgo110.go | 2 +- p2p/conn/connection.go | 16 +++---- p2p/conn/connection_test.go | 8 ++-- p2p/conn/evil_secret_connection_test.go | 10 ++-- p2p/conn/secret_connection.go | 16 +++---- p2p/conn/secret_connection_test.go | 12 ++--- p2p/conn_set.go | 2 +- p2p/fuzz.go | 6 +-- p2p/key.go | 8 ++-- p2p/key_test.go | 4 +- p2p/mock/peer.go | 8 ++-- p2p/mock/reactor.go | 6 +-- p2p/mocks/peer.go | 6 +-- p2p/netaddress.go | 2 +- p2p/node_info.go | 8 ++-- p2p/node_info_test.go | 2 +- p2p/peer.go | 8 ++-- p2p/peer_set.go | 2 +- p2p/peer_set_test.go | 4 +- p2p/peer_test.go | 14 +++--- p2p/pex/addrbook.go | 14 +++--- p2p/pex/addrbook_test.go | 8 ++-- p2p/pex/bench_test.go | 2 +- p2p/pex/errors.go | 2 +- p2p/pex/file.go | 2 +- p2p/pex/known_address.go | 2 +- p2p/pex/pex_reactor.go | 14 +++--- p2p/pex/pex_reactor_test.go | 12 ++--- p2p/switch.go | 10 ++-- p2p/switch_test.go | 12 ++--- p2p/test_util.go | 14 +++--- p2p/transport.go | 8 ++-- p2p/transport_test.go | 8 ++-- p2p/types.go | 4 +- privval/file.go | 20 ++++---- privval/file_test.go | 14 +++--- privval/msgs.go | 2 +- privval/msgs_test.go | 16 +++---- privval/retry_signer_client.go | 6 +-- privval/signer_client.go | 10 ++-- privval/signer_client_test.go | 14 +++--- privval/signer_dialer_endpoint.go | 4 +- privval/signer_endpoint.go | 8 ++-- privval/signer_listener_endpoint.go | 8 ++-- privval/signer_listener_endpoint_test.go | 10 ++-- privval/signer_requestHandler.go | 12 ++--- privval/signer_server.go | 8 ++-- privval/socket_dialers.go | 6 +-- privval/socket_dialers_test.go | 2 +- privval/socket_listeners.go | 4 +- privval/socket_listeners_test.go | 2 +- privval/utils.go | 6 +-- proto/tendermint/blocksync/message.go | 2 +- proto/tendermint/blocksync/types.pb.go | 2 +- proto/tendermint/consensus/message.go | 2 +- proto/tendermint/consensus/types.pb.go | 4 +- proto/tendermint/consensus/wal.pb.go | 2 +- proto/tendermint/mempool/message.go | 2 +- proto/tendermint/p2p/conn.pb.go | 2 +- proto/tendermint/privval/types.pb.go | 4 +- proto/tendermint/rpc/grpc/types.pb.go | 2 +- proto/tendermint/state/types.pb.go | 6 +-- proto/tendermint/statesync/message.go | 2 +- proto/tendermint/types/types.pb.go | 4 +- proto/tendermint/types/validator.pb.go | 2 +- proxy/app_conn.go | 4 +- proxy/app_conn_test.go | 10 ++-- proxy/client.go | 10 ++-- proxy/mocks/app_conn_consensus.go | 2 +- proxy/mocks/app_conn_mempool.go | 4 +- proxy/mocks/app_conn_query.go | 2 +- proxy/mocks/app_conn_snapshot.go | 2 +- proxy/mocks/client_creator.go | 2 +- proxy/multi_app_conn.go | 8 ++-- proxy/multi_app_conn_test.go | 4 +- proxy/version.go | 4 +- rpc/client/event_test.go | 10 ++-- rpc/client/evidence_test.go | 22 ++++----- rpc/client/examples_test.go | 10 ++-- rpc/client/helpers.go | 2 +- rpc/client/helpers_test.go | 6 +-- rpc/client/http/http.go | 20 ++++---- rpc/client/interface.go | 8 ++-- rpc/client/local/local.go | 20 ++++---- rpc/client/main_test.go | 6 +-- rpc/client/mock/client.go | 14 +++--- rpc/client/mock/status.go | 4 +- rpc/client/mock/status_test.go | 6 +-- rpc/client/mocks/client.go | 10 ++-- rpc/client/rpc_test.go | 24 +++++----- rpc/core/abci.go | 10 ++-- rpc/core/blocks.go | 14 +++--- rpc/core/blocks_test.go | 12 ++--- rpc/core/consensus.go | 10 ++-- rpc/core/dev.go | 4 +- rpc/core/doc.go | 2 +- rpc/core/env.go | 22 ++++----- rpc/core/events.go | 8 ++-- rpc/core/evidence.go | 6 +-- rpc/core/health.go | 4 +- rpc/core/mempool.go | 10 ++-- rpc/core/net.go | 6 +-- rpc/core/net_test.go | 8 ++-- rpc/core/routes.go | 2 +- rpc/core/status.go | 10 ++-- rpc/core/tx.go | 12 ++--- rpc/core/types/responses.go | 12 ++--- rpc/core/types/responses_test.go | 2 +- rpc/grpc/api.go | 6 +-- rpc/grpc/client_server.go | 4 +- rpc/grpc/grpc_test.go | 6 +-- rpc/grpc/types.pb.go | 2 +- rpc/jsonrpc/client/decode.go | 4 +- rpc/jsonrpc/client/encode.go | 2 +- rpc/jsonrpc/client/http_json_client.go | 4 +- rpc/jsonrpc/client/http_uri_client.go | 2 +- rpc/jsonrpc/client/integration_test.go | 2 +- rpc/jsonrpc/client/ws_client.go | 10 ++-- rpc/jsonrpc/client/ws_client_test.go | 6 +-- rpc/jsonrpc/doc.go | 2 +- rpc/jsonrpc/jsonrpc_test.go | 12 ++--- rpc/jsonrpc/server/http_json_handler.go | 6 +-- rpc/jsonrpc/server/http_json_handler_test.go | 4 +- rpc/jsonrpc/server/http_server.go | 4 +- rpc/jsonrpc/server/http_server_test.go | 4 +- rpc/jsonrpc/server/http_uri_handler.go | 6 +-- rpc/jsonrpc/server/parse_test.go | 4 +- rpc/jsonrpc/server/rpc_func.go | 2 +- rpc/jsonrpc/server/ws_handler.go | 6 +-- rpc/jsonrpc/server/ws_handler_test.go | 4 +- rpc/jsonrpc/test/main.go | 8 ++-- rpc/jsonrpc/types/types.go | 2 +- rpc/test/helpers.go | 24 +++++----- scripts/json2wal/main.go | 6 +-- .../metricsdiff/metricsdiff_test.go | 2 +- scripts/metricsgen/metricsgen_test.go | 2 +- scripts/wal2json/main.go | 4 +- state/compatibility_test.go | 12 ++--- state/execution.go | 16 +++---- state/execution_test.go | 42 ++++++++-------- state/export_test.go | 6 +-- state/helpers_test.go | 20 ++++---- state/indexer/block.go | 6 +-- state/indexer/block/indexer.go | 18 +++---- state/indexer/block/kv/kv.go | 16 +++---- state/indexer/block/kv/kv_test.go | 10 ++-- state/indexer/block/kv/util.go | 8 ++-- state/indexer/block/null/null.go | 8 ++-- state/indexer/mocks/block_indexer.go | 6 +-- state/indexer/query_range.go | 4 +- state/indexer/sink/psql/backport.go | 10 ++-- state/indexer/sink/psql/backport_test.go | 4 +- state/indexer/sink/psql/psql.go | 6 +-- state/indexer/sink/psql/psql_test.go | 8 ++-- state/mocks/block_store.go | 4 +- state/mocks/evidence_pool.go | 4 +- state/mocks/store.go | 6 +-- state/rollback.go | 6 +-- state/rollback_test.go | 20 ++++---- state/services.go | 2 +- state/state.go | 10 ++-- state/state_test.go | 16 +++---- state/store.go | 16 +++---- state/store_test.go | 14 +++--- state/tx_filter.go | 4 +- state/tx_filter_test.go | 8 ++-- state/txindex/indexer.go | 6 +-- state/txindex/indexer_service.go | 6 +-- state/txindex/indexer_service_test.go | 14 +++--- state/txindex/kv/kv.go | 18 +++---- state/txindex/kv/kv_bench_test.go | 8 ++-- state/txindex/kv/kv_test.go | 12 ++--- state/txindex/kv/utils.go | 8 ++-- state/txindex/mocks/tx_indexer.go | 8 ++-- state/txindex/null/null.go | 8 ++-- state/validation.go | 4 +- state/validation_test.go | 26 +++++----- statesync/chunks.go | 4 +- statesync/chunks_test.go | 2 +- statesync/messages.go | 2 +- statesync/messages_test.go | 6 +-- statesync/mocks/state_provider.go | 4 +- statesync/reactor.go | 16 +++---- statesync/reactor_test.go | 12 ++--- statesync/snapshots.go | 4 +- statesync/snapshots_test.go | 4 +- statesync/stateprovider.go | 26 +++++----- statesync/syncer.go | 20 ++++---- statesync/syncer_test.go | 30 ++++++------ store/bench_test.go | 6 +-- store/store.go | 14 +++--- store/store_test.go | 20 ++++---- test/app/grpc_client.go | 4 +- test/e2e/app/app.go | 20 ++++---- test/e2e/app/snapshots.go | 2 +- test/e2e/generator/generate.go | 4 +- test/e2e/generator/generate_test.go | 2 +- test/e2e/generator/main.go | 2 +- test/e2e/node/config.go | 2 +- test/e2e/node/main.go | 34 ++++++------- .../pkg/infra/digitalocean/digitalocean.go | 6 +-- test/e2e/pkg/infra/docker/docker.go | 6 +-- test/e2e/pkg/infra/provider.go | 2 +- test/e2e/pkg/testnet.go | 12 ++--- test/e2e/runner/benchmark.go | 4 +- test/e2e/runner/cleanup.go | 8 ++-- test/e2e/runner/evidence.go | 20 ++++---- test/e2e/runner/load.go | 10 ++-- test/e2e/runner/main.go | 10 ++-- test/e2e/runner/perturb.go | 8 ++-- test/e2e/runner/rpc.go | 8 ++-- test/e2e/runner/setup.go | 16 +++---- test/e2e/runner/start.go | 6 +-- test/e2e/runner/test.go | 4 +- test/e2e/runner/wait.go | 4 +- test/e2e/tests/app_test.go | 4 +- test/e2e/tests/block_test.go | 2 +- test/e2e/tests/e2e_test.go | 8 ++-- test/e2e/tests/net_test.go | 2 +- test/e2e/tests/validator_test.go | 4 +- test/fuzz/mempool/checktx.go | 8 ++-- test/fuzz/mempool/fuzz_test.go | 2 +- test/fuzz/tests/mempool_test.go | 10 ++-- test/fuzz/tests/p2p_secretconnection_test.go | 6 +-- test/fuzz/tests/rpc_jsonrpc_server_test.go | 6 +-- test/loadtime/cmd/load/main.go | 2 +- test/loadtime/cmd/report/main.go | 6 +-- test/loadtime/payload/payload_test.go | 2 +- test/loadtime/report/report.go | 4 +- test/loadtime/report/report_test.go | 6 +-- types/block.go | 22 ++++----- types/block_meta.go | 2 +- types/block_meta_test.go | 4 +- types/block_test.go | 20 ++++---- types/canonical.go | 4 +- types/canonical_test.go | 6 +-- types/encoding_helper.go | 2 +- types/event_bus.go | 8 ++-- types/event_bus_test.go | 6 +-- types/events.go | 8 ++-- types/evidence.go | 12 ++--- types/evidence_test.go | 12 ++--- types/genesis.go | 10 ++-- types/genesis_test.go | 6 +-- types/light.go | 2 +- types/light_test.go | 6 +-- types/params.go | 8 ++-- types/params_test.go | 2 +- types/part_set.go | 14 +++--- types/part_set_test.go | 4 +- types/priv_validator.go | 6 +-- types/proposal.go | 8 ++-- types/proposal_test.go | 8 ++-- types/protobuf.go | 8 ++-- types/protobuf_test.go | 8 ++-- types/results.go | 4 +- types/results_test.go | 2 +- types/signable.go | 4 +- types/signed_msg_type.go | 2 +- types/test_util.go | 6 +-- types/tx.go | 8 ++-- types/tx_test.go | 6 +-- types/validation.go | 6 +-- types/validation_test.go | 4 +- types/validator.go | 8 ++-- types/validator_set.go | 8 ++-- types/validator_set_test.go | 14 +++--- types/vote.go | 8 ++-- types/vote_set.go | 8 ++-- types/vote_set_test.go | 8 ++-- types/vote_test.go | 12 ++--- 491 files changed, 1950 insertions(+), 1950 deletions(-) diff --git a/abci/client/client.go b/abci/client/client.go index 6e46391..052460d 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -5,9 +5,9 @@ import ( "fmt" "sync" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) const ( diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index bb7a6a2..84401f1 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) var _ Client = (*grpcClient)(nil) diff --git a/abci/client/grpc_client_test.go b/abci/client/grpc_client_test.go index 68a97dd..a6ea929 100644 --- a/abci/client/grpc_client_test.go +++ b/abci/client/grpc_client_test.go @@ -14,11 +14,11 @@ import ( "golang.org/x/net/context" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" - abciserver "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/abci/types" + abciserver "git.cw.tr/mukan-network/mukan-consensus/abci/server" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) func TestGRPC(t *testing.T) { diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 25cb36c..327101a 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -3,9 +3,9 @@ package abcicli import ( "context" - types "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // NOTE: use defer to unlock mutex because Application might panic (e.g., in diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 82c6a67..34b56e6 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - abcicli "github.com/cometbft/cometbft/abci/client" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" - log "github.com/cometbft/cometbft/libs/log" + log "git.cw.tr/mukan-network/mukan-consensus/libs/log" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) // Client is an autogenerated mock type for the Client type diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 91aed1f..e87da52 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/libs/timer" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/timer" ) const ( diff --git a/abci/client/socket_client_test.go b/abci/client/socket_client_test.go index 17e5d0f..4305c5e 100644 --- a/abci/client/socket_client_test.go +++ b/abci/client/socket_client_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/abci/types" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/server" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) func TestCalls(t *testing.T) { diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index a23485b..5a0c4e6 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -11,16 +11,16 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/abci/server" - servertest "github.com/cometbft/cometbft/abci/tests/server" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/abci/version" - "github.com/cometbft/cometbft/proto/tendermint/crypto" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/abci/server" + servertest "git.cw.tr/mukan-network/mukan-consensus/abci/tests/server" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/version" + "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) // client is a global variable so it can be reused by the console diff --git a/abci/example/kvstore/helpers.go b/abci/example/kvstore/helpers.go index 72bd5a0..8cebc9c 100644 --- a/abci/example/kvstore/helpers.go +++ b/abci/example/kvstore/helpers.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/abci/types" - cryptoencoding "github.com/cometbft/cometbft/crypto/encoding" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/proto/tendermint/crypto" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cryptoencoding "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) // RandVal creates one random validator, with a key derived diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 15673d7..4e24162 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -10,13 +10,13 @@ import ( "strconv" "strings" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/abci/types" - cryptoencoding "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/log" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cryptoencoding "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cryptoproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + "git.cw.tr/mukan-network/mukan-consensus/version" ) var ( diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go index e87c90b..f3b8454 100644 --- a/abci/example/kvstore/kvstore_test.go +++ b/abci/example/kvstore/kvstore_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" - abcicli "github.com/cometbft/cometbft/abci/client" - abciserver "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/abci/types" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + abciserver "git.cw.tr/mukan-network/mukan-consensus/abci/server" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) const ( diff --git a/abci/server/grpc_server.go b/abci/server/grpc_server.go index 6dd9750..0dec709 100644 --- a/abci/server/grpc_server.go +++ b/abci/server/grpc_server.go @@ -6,9 +6,9 @@ import ( "google.golang.org/grpc" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) type GRPCServer struct { diff --git a/abci/server/server.go b/abci/server/server.go index f6c2584..b346f61 100644 --- a/abci/server/server.go +++ b/abci/server/server.go @@ -10,8 +10,8 @@ package server import ( "fmt" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) // NewServer is a utility function for out of process applications to set up either a socket or diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index d33a3f6..2de09a8 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -10,11 +10,11 @@ import ( "os" "runtime" - "github.com/cometbft/cometbft/abci/types" - cmtlog "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtlog "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // SocketServer is the server-side implementation of the TSP (Tendermint Socket Protocol) diff --git a/abci/tests/benchmarks/parallel/parallel.go b/abci/tests/benchmarks/parallel/parallel.go index 5834651..c836329 100644 --- a/abci/tests/benchmarks/parallel/parallel.go +++ b/abci/tests/benchmarks/parallel/parallel.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" ) func main() { diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go index 13b9747..95cbed9 100644 --- a/abci/tests/benchmarks/simple/simple.go +++ b/abci/tests/benchmarks/simple/simple.go @@ -7,8 +7,8 @@ import ( "log" "reflect" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" ) func main() { diff --git a/abci/tests/client_server_test.go b/abci/tests/client_server_test.go index e5229b3..c668302 100644 --- a/abci/tests/client_server_test.go +++ b/abci/tests/client_server_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - abciclient "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - abciserver "github.com/cometbft/cometbft/abci/server" + abciclient "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abciserver "git.cw.tr/mukan-network/mukan-consensus/abci/server" ) func TestClientServerNoAddrPrefix(t *testing.T) { diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go index 166e330..91852a9 100644 --- a/abci/tests/server/client.go +++ b/abci/tests/server/client.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/types" - cmtrand "github.com/cometbft/cometbft/libs/rand" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) func InitChain(ctx context.Context, client abcicli.Client) error { diff --git a/abci/types/messages.go b/abci/types/messages.go index bed8b51..1d457a8 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" ) const ( diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go index 2919778..c50d7ef 100644 --- a/abci/types/messages_test.go +++ b/abci/types/messages_test.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/assert" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) func TestMarshalJSON(t *testing.T) { diff --git a/abci/types/mocks/application.go b/abci/types/mocks/application.go index a8ad98d..4af277d 100644 --- a/abci/types/mocks/application.go +++ b/abci/types/mocks/application.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" mock "github.com/stretchr/testify/mock" ) diff --git a/abci/types/pubkey.go b/abci/types/pubkey.go index 638c36b..f2e847e 100644 --- a/abci/types/pubkey.go +++ b/abci/types/pubkey.go @@ -3,9 +3,9 @@ package types import ( fmt "fmt" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/secp256k1" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/crypto/secp256k1" ) func Ed25519ValidatorUpdate(pk []byte, power int64) ValidatorUpdate { diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 450fb22..1a2961b 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -6,8 +6,8 @@ package types import ( context "context" fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" + crypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + types1 "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" diff --git a/abci/types/types_test.go b/abci/types/types_test.go index bf07c29..66c62cd 100644 --- a/abci/types/types_test.go +++ b/abci/types/types_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" ) func TestHashAndProveResults(t *testing.T) { diff --git a/abci/version/version.go b/abci/version/version.go index 85a2824..2ac657e 100644 --- a/abci/version/version.go +++ b/abci/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // TODO: eliminate this after some version refactor diff --git a/blocksync/metrics.go b/blocksync/metrics.go index 5ef5568..a1762a5 100644 --- a/blocksync/metrics.go +++ b/blocksync/metrics.go @@ -1,7 +1,7 @@ package blocksync import ( - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" "github.com/go-kit/kit/metrics" ) diff --git a/blocksync/msgs.go b/blocksync/msgs.go index eddd73a..8c5b19c 100644 --- a/blocksync/msgs.go +++ b/blocksync/msgs.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/gogoproto/proto" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" - "github.com/cometbft/cometbft/types" + bcproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/blocksync" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( @@ -31,7 +31,7 @@ func ValidateMsg(pb proto.Message) error { } case *bcproto.BlockResponse: // Avoid double-calling `types.BlockFromProto` for performance reasons. - // See https://github.com/cometbft/cometbft/issues/1964 + // See https://git.cw.tr/mukan-network/mukan-consensus/issues/1964 return nil case *bcproto.NoBlockResponse: if msg.Height < 0 { diff --git a/blocksync/msgs_test.go b/blocksync/msgs_test.go index 1c17d43..19b5072 100644 --- a/blocksync/msgs_test.go +++ b/blocksync/msgs_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/blocksync" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/blocksync" + bcproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/blocksync" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestBcBlockRequestMessageValidateBasic(t *testing.T) { diff --git a/blocksync/pool.go b/blocksync/pool.go index 656fd83..19fd4e0 100644 --- a/blocksync/pool.go +++ b/blocksync/pool.go @@ -8,13 +8,13 @@ import ( "sync/atomic" "time" - flow "github.com/cometbft/cometbft/libs/flowrate" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + flow "git.cw.tr/mukan-network/mukan-consensus/libs/flowrate" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) /* diff --git a/blocksync/pool_test.go b/blocksync/pool_test.go index 0573358..e02c0a6 100644 --- a/blocksync/pool_test.go +++ b/blocksync/pool_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func init() { diff --git a/blocksync/reactor.go b/blocksync/reactor.go index 5c38fe3..6f9cba7 100644 --- a/blocksync/reactor.go +++ b/blocksync/reactor.go @@ -6,13 +6,13 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + bcproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/blocksync" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/blocksync/reactor_test.go b/blocksync/reactor_test.go index 9f0940b..f5510a9 100644 --- a/blocksync/reactor_test.go +++ b/blocksync/reactor_test.go @@ -8,26 +8,26 @@ import ( "testing" "time" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" + bcproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/blocksync" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - mpmocks "github.com/cometbft/cometbft/mempool/mocks" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + mpmocks "git.cw.tr/mukan-network/mukan-consensus/mempool/mocks" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) var config *cfg.Config diff --git a/cmd/cometbft/commands/compact.go b/cmd/cometbft/commands/compact.go index db6b52c..901b991 100644 --- a/cmd/cometbft/commands/compact.go +++ b/cmd/cometbft/commands/compact.go @@ -10,7 +10,7 @@ import ( "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) var CompactGoLevelDBCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/debug.go b/cmd/cometbft/commands/debug/debug.go index fad1997..2692bfa 100644 --- a/cmd/cometbft/commands/debug/debug.go +++ b/cmd/cometbft/commands/debug/debug.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) var ( diff --git a/cmd/cometbft/commands/debug/dump.go b/cmd/cometbft/commands/debug/dump.go index 3dd0a68..2cabd85 100644 --- a/cmd/cometbft/commands/debug/dump.go +++ b/cmd/cometbft/commands/debug/dump.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/cli" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" ) var dumpCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/kill.go b/cmd/cometbft/commands/debug/kill.go index 50370cc..9238740 100644 --- a/cmd/cometbft/commands/debug/kill.go +++ b/cmd/cometbft/commands/debug/kill.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/cli" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" ) var killCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/util.go b/cmd/cometbft/commands/debug/util.go index 7fdc5ad..1e1622a 100644 --- a/cmd/cometbft/commands/debug/util.go +++ b/cmd/cometbft/commands/debug/util.go @@ -9,8 +9,8 @@ import ( "path" "path/filepath" - cfg "github.com/cometbft/cometbft/config" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" ) // dumpStatus gets node status state dump from the CometBFT RPC and writes it diff --git a/cmd/cometbft/commands/gen_node_key.go b/cmd/cometbft/commands/gen_node_key.go index 6bbf0e1..881b68c 100644 --- a/cmd/cometbft/commands/gen_node_key.go +++ b/cmd/cometbft/commands/gen_node_key.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/p2p" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // GenNodeKeyCmd allows the generation of a node key. It prints node's ID to diff --git a/cmd/cometbft/commands/gen_validator.go b/cmd/cometbft/commands/gen_validator.go index d2b6979..1d4ca3f 100644 --- a/cmd/cometbft/commands/gen_validator.go +++ b/cmd/cometbft/commands/gen_validator.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/privval" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/privval" ) // GenValidatorCmd allows the generation of a keypair for a diff --git a/cmd/cometbft/commands/init.go b/cmd/cometbft/commands/init.go index 239da31..bdc697d 100644 --- a/cmd/cometbft/commands/init.go +++ b/cmd/cometbft/commands/init.go @@ -5,13 +5,13 @@ import ( "github.com/spf13/cobra" - cfg "github.com/cometbft/cometbft/config" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) // InitFilesCmd initializes a fresh CometBFT instance. diff --git a/cmd/cometbft/commands/inspect.go b/cmd/cometbft/commands/inspect.go index fec3385..0d4cc05 100644 --- a/cmd/cometbft/commands/inspect.go +++ b/cmd/cometbft/commands/inspect.go @@ -8,12 +8,12 @@ import ( "github.com/spf13/cobra" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/inspect" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer/block" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/inspect" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // InspectCmd is the command for starting an inspect server. diff --git a/cmd/cometbft/commands/light.go b/cmd/cometbft/commands/light.go index 7458645..ccb1021 100644 --- a/cmd/cometbft/commands/light.go +++ b/cmd/cometbft/commands/light.go @@ -13,16 +13,16 @@ import ( "github.com/spf13/cobra" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/light" - lproxy "github.com/cometbft/cometbft/light/proxy" - lrpc "github.com/cometbft/cometbft/light/rpc" - dbs "github.com/cometbft/cometbft/light/store/db" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/light" + lproxy "git.cw.tr/mukan-network/mukan-consensus/light/proxy" + lrpc "git.cw.tr/mukan-network/mukan-consensus/light/rpc" + dbs "git.cw.tr/mukan-network/mukan-consensus/light/store/db" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" ) // LightCmd represents the base command when called without any subcommands diff --git a/cmd/cometbft/commands/reindex_event.go b/cmd/cometbft/commands/reindex_event.go index 68261a7..c03ce20 100644 --- a/cmd/cometbft/commands/reindex_event.go +++ b/cmd/cometbft/commands/reindex_event.go @@ -7,18 +7,18 @@ import ( "github.com/spf13/cobra" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abcitypes "github.com/cometbft/cometbft/abci/types" - cmtcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/progressbar" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - "github.com/cometbft/cometbft/state/indexer/sink/psql" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/kv" - "github.com/cometbft/cometbft/types" + abcitypes "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtcfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/progressbar" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + blockidxkv "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block/kv" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer/sink/psql" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex/kv" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/cmd/cometbft/commands/reindex_event_test.go b/cmd/cometbft/commands/reindex_event_test.go index a20c6dd..4b54138 100644 --- a/cmd/cometbft/commands/reindex_event_test.go +++ b/cmd/cometbft/commands/reindex_event_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abcitypes "github.com/cometbft/cometbft/abci/types" - cmtcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - blockmocks "github.com/cometbft/cometbft/state/indexer/mocks" - "github.com/cometbft/cometbft/state/mocks" - txmocks "github.com/cometbft/cometbft/state/txindex/mocks" - "github.com/cometbft/cometbft/types" + abcitypes "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtcfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + blockmocks "git.cw.tr/mukan-network/mukan-consensus/state/indexer/mocks" + "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + txmocks "git.cw.tr/mukan-network/mukan-consensus/state/txindex/mocks" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/cmd/cometbft/commands/replay.go b/cmd/cometbft/commands/replay.go index a04ed48..c910781 100644 --- a/cmd/cometbft/commands/replay.go +++ b/cmd/cometbft/commands/replay.go @@ -3,7 +3,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/consensus" + "git.cw.tr/mukan-network/mukan-consensus/consensus" ) // ReplayCmd allows replaying of messages from the WAL. diff --git a/cmd/cometbft/commands/reset.go b/cmd/cometbft/commands/reset.go index b85fecc..593dc34 100644 --- a/cmd/cometbft/commands/reset.go +++ b/cmd/cometbft/commands/reset.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/privval" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/privval" ) // ResetAllCmd removes the database of this CometBFT core diff --git a/cmd/cometbft/commands/reset_test.go b/cmd/cometbft/commands/reset_test.go index e80dbf0..79320da 100644 --- a/cmd/cometbft/commands/reset_test.go +++ b/cmd/cometbft/commands/reset_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/privval" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/privval" ) func Test_ResetAll(t *testing.T) { diff --git a/cmd/cometbft/commands/rollback.go b/cmd/cometbft/commands/rollback.go index 9258f21..c78338d 100644 --- a/cmd/cometbft/commands/rollback.go +++ b/cmd/cometbft/commands/rollback.go @@ -6,12 +6,12 @@ import ( "github.com/spf13/cobra" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" ) var removeBlock = false diff --git a/cmd/cometbft/commands/root.go b/cmd/cometbft/commands/root.go index a873508..67aeee3 100644 --- a/cmd/cometbft/commands/root.go +++ b/cmd/cometbft/commands/root.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - "github.com/cometbft/cometbft/libs/log" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/cli" + cmtflags "git.cw.tr/mukan-network/mukan-consensus/libs/cli/flags" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) var ( diff --git a/cmd/cometbft/commands/root_test.go b/cmd/cometbft/commands/root_test.go index 333002b..2652452 100644 --- a/cmd/cometbft/commands/root_test.go +++ b/cmd/cometbft/commands/root_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - cmtos "github.com/cometbft/cometbft/libs/os" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/cli" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" ) // clearConfig clears env vars, the given root dir, and resets viper. diff --git a/cmd/cometbft/commands/run_node.go b/cmd/cometbft/commands/run_node.go index 1034016..5118189 100644 --- a/cmd/cometbft/commands/run_node.go +++ b/cmd/cometbft/commands/run_node.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" - cfg "github.com/cometbft/cometbft/config" - cmtos "github.com/cometbft/cometbft/libs/os" - nm "github.com/cometbft/cometbft/node" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + nm "git.cw.tr/mukan-network/mukan-consensus/node" ) var ( diff --git a/cmd/cometbft/commands/show_node_id.go b/cmd/cometbft/commands/show_node_id.go index 3ce6f81..03c9805 100644 --- a/cmd/cometbft/commands/show_node_id.go +++ b/cmd/cometbft/commands/show_node_id.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // ShowNodeIDCmd dumps node's ID to the standard output. diff --git a/cmd/cometbft/commands/show_validator.go b/cmd/cometbft/commands/show_validator.go index 43cd787..52753e4 100644 --- a/cmd/cometbft/commands/show_validator.go +++ b/cmd/cometbft/commands/show_validator.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/privval" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/privval" ) // ShowValidatorCmd adds capabilities for showing the validator info. diff --git a/cmd/cometbft/commands/testnet.go b/cmd/cometbft/commands/testnet.go index ca754c8..12a3278 100644 --- a/cmd/cometbft/commands/testnet.go +++ b/cmd/cometbft/commands/testnet.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/bytes" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) var ( diff --git a/cmd/cometbft/commands/version.go b/cmd/cometbft/commands/version.go index 8bdd456..ea2bcb8 100644 --- a/cmd/cometbft/commands/version.go +++ b/cmd/cometbft/commands/version.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // VersionCmd ... diff --git a/cmd/cometbft/main.go b/cmd/cometbft/main.go index e52b985..e8ccec9 100644 --- a/cmd/cometbft/main.go +++ b/cmd/cometbft/main.go @@ -4,11 +4,11 @@ import ( "os" "path/filepath" - cmd "github.com/cometbft/cometbft/cmd/cometbft/commands" - "github.com/cometbft/cometbft/cmd/cometbft/commands/debug" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - nm "github.com/cometbft/cometbft/node" + cmd "git.cw.tr/mukan-network/mukan-consensus/cmd/cometbft/commands" + "git.cw.tr/mukan-network/mukan-consensus/cmd/cometbft/commands/debug" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/cli" + nm "git.cw.tr/mukan-network/mukan-consensus/node" ) func main() { diff --git a/cmd/priv_val_server/main.go b/cmd/priv_val_server/main.go index 3abc3bc..129d3df 100644 --- a/cmd/priv_val_server/main.go +++ b/cmd/priv_val_server/main.go @@ -5,12 +5,12 @@ import ( "os" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - cmtos "github.com/cometbft/cometbft/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" - "github.com/cometbft/cometbft/privval" + "git.cw.tr/mukan-network/mukan-consensus/privval" ) func main() { diff --git a/config/config.go b/config/config.go index 5d01a3a..9a78b79 100644 --- a/config/config.go +++ b/config/config.go @@ -10,7 +10,7 @@ import ( "regexp" "time" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const ( @@ -706,7 +706,7 @@ func DefaultFuzzConnConfig() *FuzzConnConfig { // Note: Until v0.37 there was a `Version` field to select which implementation // of the mempool to use. Two versions used to exist: the current, default // implementation (previously called v0), and a prioritized mempool (v1), which -// was removed (see https://github.com/cometbft/cometbft/issues/260). +// was removed (see https://git.cw.tr/mukan-network/mukan-consensus/issues/260). type MempoolConfig struct { // The type of mempool for this node to use. // diff --git a/config/config_test.go b/config/config_test.go index 87ff71e..88ab204 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" + "git.cw.tr/mukan-network/mukan-consensus/config" ) func TestDefaultConfig(t *testing.T) { diff --git a/config/db.go b/config/db.go index 0e213af..7555f0a 100644 --- a/config/db.go +++ b/config/db.go @@ -3,10 +3,10 @@ package config import ( "context" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) // ServiceProvider takes a config and a logger and returns a ready to go Node. diff --git a/config/toml.go b/config/toml.go index c7edc03..fa2c6d7 100644 --- a/config/toml.go +++ b/config/toml.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - cmtos "github.com/cometbft/cometbft/libs/os" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" ) // DefaultDirPerm is the default permissions used when creating directories. diff --git a/config/toml_test.go b/config/toml_test.go index 0f1f52f..a3ab2d1 100644 --- a/config/toml_test.go +++ b/config/toml_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" ) func ensureFiles(t *testing.T, rootDir string, files ...string) { diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index ec6c650..2c9d2d8 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -12,23 +12,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abcicli "github.com/cometbft/cometbft/abci/client" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/proxy" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //---------------------------------------------- diff --git a/consensus/common_test.go b/consensus/common_test.go index b5f5051..2529e77 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -16,28 +16,28 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/internal/test" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) const ( diff --git a/consensus/invalid_test.go b/consensus/invalid_test.go index 76ab85c..645b45d 100644 --- a/consensus/invalid_test.go +++ b/consensus/invalid_test.go @@ -4,14 +4,14 @@ import ( "testing" "time" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //---------------------------------------------- diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 1bf961d..ecb67fe 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -10,14 +10,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // for testing diff --git a/consensus/metrics.go b/consensus/metrics.go index 2cc6d7a..73581c4 100644 --- a/consensus/metrics.go +++ b/consensus/metrics.go @@ -6,9 +6,9 @@ import ( "github.com/go-kit/kit/metrics" - cstypes "github.com/cometbft/cometbft/consensus/types" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - types "github.com/cometbft/cometbft/types" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/consensus/msgs.go b/consensus/msgs.go index e1ac026..c0fc8fb 100644 --- a/consensus/msgs.go +++ b/consensus/msgs.go @@ -6,13 +6,13 @@ import ( "github.com/cosmos/gogoproto/proto" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/libs/bits" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // MsgToProto takes a consensus message type and returns the proto defined consensus message. diff --git a/consensus/msgs_test.go b/consensus/msgs_test.go index 67de556..532e268 100644 --- a/consensus/msgs_test.go +++ b/consensus/msgs_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/bits" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestMsgToProto(t *testing.T) { diff --git a/consensus/reactor.go b/consensus/reactor.go index 6a2b031..59f4018 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -7,18 +7,18 @@ import ( "sync" "time" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/libs/bits" - cmtevents "github.com/cometbft/cometbft/libs/events" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + cmtevents "git.cw.tr/mukan-network/mukan-consensus/libs/events" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) const ( diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go index 771c05f..e1cb1b1 100644 --- a/consensus/reactor_test.go +++ b/consensus/reactor_test.go @@ -13,31 +13,31 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - cstypes "github.com/cometbft/cometbft/consensus/types" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bits" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - p2pmock "github.com/cometbft/cometbft/p2p/mock" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - statemocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + p2pmock "git.cw.tr/mukan-network/mukan-consensus/p2p/mock" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + statemocks "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //---------------------------------------------- diff --git a/consensus/replay.go b/consensus/replay.go index 293d5f2..d27222e 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -9,12 +9,12 @@ import ( "reflect" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var crc32c = crc32.MakeTable(crc32.Castagnoli) diff --git a/consensus/replay_file.go b/consensus/replay_file.go index 5a4b2ba..2a0d32f 100644 --- a/consensus/replay_file.go +++ b/consensus/replay_file.go @@ -10,15 +10,15 @@ import ( "strconv" "strings" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/consensus/replay_stubs.go b/consensus/replay_stubs.go index e96866d..998989b 100644 --- a/consensus/replay_stubs.go +++ b/consensus/replay_stubs.go @@ -3,11 +3,11 @@ package consensus import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/clist" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/clist" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/replay_test.go b/consensus/replay_test.go index a73b01d..f086f9f 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -17,23 +17,23 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/abci/types/mocks" - cfg "github.com/cometbft/cometbft/config" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - smmocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/types/mocks" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + smmocks "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestMain(m *testing.M) { diff --git a/consensus/state.go b/consensus/state.go index a303a6c..bf64019 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -13,22 +13,22 @@ import ( "github.com/cosmos/gogoproto/proto" - cfg "github.com/cometbft/cometbft/config" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/crypto" - cmtevents "github.com/cometbft/cometbft/libs/events" - "github.com/cometbft/cometbft/libs/fail" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtevents "git.cw.tr/mukan-network/mukan-consensus/libs/events" + "git.cw.tr/mukan-network/mukan-consensus/libs/fail" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) // Consensus sentinel errors @@ -1123,7 +1123,7 @@ func (cs *State) needProofBlock(height int64) bool { lastBlockMeta := cs.blockStore.LoadBlockMeta(height - 1) if lastBlockMeta == nil { - // See https://github.com/cometbft/cometbft/issues/370 + // See https://git.cw.tr/mukan-network/mukan-consensus/issues/370 cs.Logger.Info("short-circuited needProofBlock", "height", height, "InitialHeight", cs.state.InitialHeight) return true } @@ -2419,10 +2419,10 @@ func (cs *State) voteTime() time.Time { // Minimum time increment between blocks const timeIota = time.Millisecond // TODO: We should remove next line in case we don't vote for v in case cs.ProposalBlock == nil, - // even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/v0.38.x/spec/. + // even if cs.LockedBlock != nil. See https://git.cw.tr/mukan-network/mukan-consensus/tree/v0.38.x/spec/. if cs.LockedBlock != nil { // See the BFT time spec - // https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/bft-time.md + // https://git.cw.tr/mukan-network/mukan-consensus/blob/v0.38.x/spec/consensus/bft-time.md minVoteTime = cs.LockedBlock.Time.Add(timeIota) } else if cs.ProposalBlock != nil { minVoteTime = cs.ProposalBlock.Time.Add(timeIota) diff --git a/consensus/state_test.go b/consensus/state_test.go index d196a9f..8185603 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -12,20 +12,20 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - abcimocks "github.com/cometbft/cometbft/abci/types/mocks" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtrand "github.com/cometbft/cometbft/libs/rand" - p2pmock "github.com/cometbft/cometbft/p2p/mock" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + abcimocks "git.cw.tr/mukan-network/mukan-consensus/abci/types/mocks" + cstypes "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + p2pmock "git.cw.tr/mukan-network/mukan-consensus/p2p/mock" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) /* diff --git a/consensus/ticker.go b/consensus/ticker.go index 37d7b10..1d8bcc6 100644 --- a/consensus/ticker.go +++ b/consensus/ticker.go @@ -3,8 +3,8 @@ package consensus import ( "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) var ( diff --git a/consensus/ticker_test.go b/consensus/ticker_test.go index e603425..41c8780 100644 --- a/consensus/ticker_test.go +++ b/consensus/ticker_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/consensus/types" ) func TestTimeoutTicker(t *testing.T) { diff --git a/consensus/types/height_vote_set.go b/consensus/types/height_vote_set.go index 5fb3d8e..781b408 100644 --- a/consensus/types/height_vote_set.go +++ b/consensus/types/height_vote_set.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type RoundVoteSet struct { diff --git a/consensus/types/height_vote_set_test.go b/consensus/types/height_vote_set_test.go index 9ec504f..164c27b 100644 --- a/consensus/types/height_vote_set_test.go +++ b/consensus/types/height_vote_set_test.go @@ -4,13 +4,13 @@ import ( "os" "testing" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" "github.com/stretchr/testify/require" ) diff --git a/consensus/types/peer_round_state.go b/consensus/types/peer_round_state.go index 729d274..f3991e8 100644 --- a/consensus/types/peer_round_state.go +++ b/consensus/types/peer_round_state.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/bits" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/types/round_state.go b/consensus/types/round_state.go index 69ff6e5..e7f0733 100644 --- a/consensus/types/round_state.go +++ b/consensus/types/round_state.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/wal.go b/consensus/wal.go index 204590e..b643516 100644 --- a/consensus/wal.go +++ b/consensus/wal.go @@ -11,13 +11,13 @@ import ( "github.com/cosmos/gogoproto/proto" - auto "github.com/cometbft/cometbft/libs/autofile" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/service" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmttime "github.com/cometbft/cometbft/types/time" + auto "git.cw.tr/mukan-network/mukan-consensus/libs/autofile" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtcons "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/consensus" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) const ( diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go index 8543b57..58cabec 100644 --- a/consensus/wal_generator.go +++ b/consensus/wal_generator.go @@ -9,18 +9,18 @@ import ( "testing" "time" - db "github.com/cometbft/cometbft-db" + db "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // WALGenerateNBlocks generates a consensus WAL. It does this by spinning up a diff --git a/consensus/wal_test.go b/consensus/wal_test.go index 24aee47..45185b1 100644 --- a/consensus/wal_test.go +++ b/consensus/wal_test.go @@ -13,12 +13,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/autofile" - "github.com/cometbft/cometbft/libs/log" - cmttypes "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/libs/autofile" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmttypes "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) const ( diff --git a/crypto/batch/batch.go b/crypto/batch/batch.go index 557b1ee..1c640eb 100644 --- a/crypto/batch/batch.go +++ b/crypto/batch/batch.go @@ -1,9 +1,9 @@ package batch import ( - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/sr25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/sr25519" ) // CreateBatchVerifier checks if a key type implements the batch verifier interface. diff --git a/crypto/crypto.go b/crypto/crypto.go index f725f9c..b54ac28 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -1,8 +1,8 @@ package crypto import ( - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" ) const ( @@ -42,7 +42,7 @@ type Symmetric interface { } // If a new key type implements batch verification, -// the key type must be registered in github.com/cometbft/cometbft/crypto/batch +// the key type must be registered in git.cw.tr/mukan-network/mukan-consensus/crypto/batch type BatchVerifier interface { // Add appends an entry into the BatchVerifier. Add(key PubKey, message, signature []byte) error diff --git a/crypto/ed25519/bench_test.go b/crypto/ed25519/bench_test.go index 25d97aa..9a00efa 100644 --- a/crypto/ed25519/bench_test.go +++ b/crypto/ed25519/bench_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/internal/benchmarking" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/crypto/ed25519/ed25519.go b/crypto/ed25519/ed25519.go index 3a8e131..2d7f011 100644 --- a/crypto/ed25519/ed25519.go +++ b/crypto/ed25519/ed25519.go @@ -10,9 +10,9 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/ed25519" "github.com/oasisprotocol/curve25519-voi/primitives/ed25519/extra/cache" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtjson "github.com/cometbft/cometbft/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) //------------------------------------- diff --git a/crypto/ed25519/ed25519_test.go b/crypto/ed25519/ed25519_test.go index 606dac7..424d8bb 100644 --- a/crypto/ed25519/ed25519_test.go +++ b/crypto/ed25519/ed25519_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" ) func TestSignAndValidateEd25519(t *testing.T) { diff --git a/crypto/encoding/codec.go b/crypto/encoding/codec.go index c3343db..393fa6b 100644 --- a/crypto/encoding/codec.go +++ b/crypto/encoding/codec.go @@ -3,11 +3,11 @@ package encoding import ( "fmt" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/secp256k1" - "github.com/cometbft/cometbft/libs/json" - pc "github.com/cometbft/cometbft/proto/tendermint/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/secp256k1" + "git.cw.tr/mukan-network/mukan-consensus/libs/json" + pc "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) func init() { diff --git a/crypto/example_test.go b/crypto/example_test.go index ca488b7..43c7838 100644 --- a/crypto/example_test.go +++ b/crypto/example_test.go @@ -3,7 +3,7 @@ package crypto_test import ( "fmt" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) func ExampleSha256() { diff --git a/crypto/internal/benchmarking/bench.go b/crypto/internal/benchmarking/bench.go index 804df50..5e38b4f 100644 --- a/crypto/internal/benchmarking/bench.go +++ b/crypto/internal/benchmarking/bench.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) // The code in this file is adapted from agl/ed25519. diff --git a/crypto/merkle/hash.go b/crypto/merkle/hash.go index 21e2f7a..ac1dbb0 100644 --- a/crypto/merkle/hash.go +++ b/crypto/merkle/hash.go @@ -3,7 +3,7 @@ package merkle import ( "hash" - "github.com/cometbft/cometbft/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" ) // TODO: make these have a large predefined capacity diff --git a/crypto/merkle/proof.go b/crypto/merkle/proof.go index 2804d0f..26f924e 100644 --- a/crypto/merkle/proof.go +++ b/crypto/merkle/proof.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtcrypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) const ( diff --git a/crypto/merkle/proof_op.go b/crypto/merkle/proof_op.go index a83638c..ff4303b 100644 --- a/crypto/merkle/proof_op.go +++ b/crypto/merkle/proof_op.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + cmtcrypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) //---------------------------------------- diff --git a/crypto/merkle/proof_test.go b/crypto/merkle/proof_test.go index 50cbf21..051d030 100644 --- a/crypto/merkle/proof_test.go +++ b/crypto/merkle/proof_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtcrypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) const ProofOpDomino = "test:domino" diff --git a/crypto/merkle/proof_value.go b/crypto/merkle/proof_value.go index f55854f..a465331 100644 --- a/crypto/merkle/proof_value.go +++ b/crypto/merkle/proof_value.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtcrypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" ) const ProofOpValue = "simple:v" diff --git a/crypto/merkle/rfc6962_test.go b/crypto/merkle/rfc6962_test.go index 5f383c7..0bd6b68 100644 --- a/crypto/merkle/rfc6962_test.go +++ b/crypto/merkle/rfc6962_test.go @@ -20,7 +20,7 @@ import ( "encoding/hex" "testing" - "github.com/cometbft/cometbft/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" ) func TestRFC6962Hasher(t *testing.T) { diff --git a/crypto/merkle/tree_test.go b/crypto/merkle/tree_test.go index da4bb6f..b680c65 100644 --- a/crypto/merkle/tree_test.go +++ b/crypto/merkle/tree_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/test" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/test" - "github.com/cometbft/cometbft/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" ) type testItem []byte diff --git a/crypto/random_test.go b/crypto/random_test.go index d456601..30face6 100644 --- a/crypto/random_test.go +++ b/crypto/random_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) // the purpose of this test is primarily to ensure that the randomness diff --git a/crypto/secp256k1/secp256k1.go b/crypto/secp256k1/secp256k1.go index d2b04e5..5b05ccb 100644 --- a/crypto/secp256k1/secp256k1.go +++ b/crypto/secp256k1/secp256k1.go @@ -12,8 +12,8 @@ import ( "github.com/decred/dcrd/dcrec/secp256k1/v4/ecdsa" "golang.org/x/crypto/ripemd160" //nolint: gosec,staticcheck // necessary for Bitcoin address format - "github.com/cometbft/cometbft/crypto" - cmtjson "github.com/cometbft/cometbft/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) // ------------------------------------- diff --git a/crypto/secp256k1/secp256k1_test.go b/crypto/secp256k1/secp256k1_test.go index 46e10f3..9232253 100644 --- a/crypto/secp256k1/secp256k1_test.go +++ b/crypto/secp256k1/secp256k1_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/secp256k1" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/secp256k1" ) type keyData struct { diff --git a/crypto/sr25519/batch.go b/crypto/sr25519/batch.go index c5dbaec..0da8cd7 100644 --- a/crypto/sr25519/batch.go +++ b/crypto/sr25519/batch.go @@ -5,7 +5,7 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/sr25519" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) var _ crypto.BatchVerifier = &BatchVerifier{} diff --git a/crypto/sr25519/bench_test.go b/crypto/sr25519/bench_test.go index bdb53da..778797e 100644 --- a/crypto/sr25519/bench_test.go +++ b/crypto/sr25519/bench_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/internal/benchmarking" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/crypto/sr25519/encoding.go b/crypto/sr25519/encoding.go index 69131bf..e6af6e9 100644 --- a/crypto/sr25519/encoding.go +++ b/crypto/sr25519/encoding.go @@ -1,6 +1,6 @@ package sr25519 -import cmtjson "github.com/cometbft/cometbft/libs/json" +import cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" const ( PrivKeyName = "tendermint/PrivKeySr25519" diff --git a/crypto/sr25519/privkey.go b/crypto/sr25519/privkey.go index 1bc029d..2f3e43f 100644 --- a/crypto/sr25519/privkey.go +++ b/crypto/sr25519/privkey.go @@ -7,7 +7,7 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/sr25519" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) var ( diff --git a/crypto/sr25519/pubkey.go b/crypto/sr25519/pubkey.go index 0f4930c..118aebf 100644 --- a/crypto/sr25519/pubkey.go +++ b/crypto/sr25519/pubkey.go @@ -6,8 +6,8 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/sr25519" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" ) var _ crypto.PubKey = PubKey{} diff --git a/crypto/sr25519/sr25519_test.go b/crypto/sr25519/sr25519_test.go index 4f8d15b..02fedb1 100644 --- a/crypto/sr25519/sr25519_test.go +++ b/crypto/sr25519/sr25519_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/sr25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/sr25519" ) func TestSignAndValidateSr25519(t *testing.T) { diff --git a/crypto/tmhash/hash_test.go b/crypto/tmhash/hash_test.go index a43cce3..2da7370 100644 --- a/crypto/tmhash/hash_test.go +++ b/crypto/tmhash/hash_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" ) func TestHash(t *testing.T) { diff --git a/crypto/xsalsa20symmetric/symmetric.go b/crypto/xsalsa20symmetric/symmetric.go index 5afa6e6..703ac19 100644 --- a/crypto/xsalsa20symmetric/symmetric.go +++ b/crypto/xsalsa20symmetric/symmetric.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/nacl/secretbox" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) // TODO, make this into a struct that implements crypto.Symmetric. diff --git a/crypto/xsalsa20symmetric/symmetric_test.go b/crypto/xsalsa20symmetric/symmetric_test.go index 6643177..f74f2da 100644 --- a/crypto/xsalsa20symmetric/symmetric_test.go +++ b/crypto/xsalsa20symmetric/symmetric_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/cometbft/cometbft/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto" ) func TestSimple(t *testing.T) { diff --git a/evidence/doc.go b/evidence/doc.go index 1ef9fea..2e80ec5 100644 --- a/evidence/doc.go +++ b/evidence/doc.go @@ -1,7 +1,7 @@ /* Package evidence handles all evidence storage and gossiping from detection to block proposal. For the different types of evidence refer to the `evidence.go` file in the types package -or https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/light-client/accountability.md. +or https://git.cw.tr/mukan-network/mukan-consensus/blob/v0.38.x/spec/consensus/light-client/accountability.md. # Gossiping diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index bcbc19c..5520c87 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" mock "github.com/stretchr/testify/mock" ) diff --git a/evidence/pool.go b/evidence/pool.go index c90d915..26116fd 100644 --- a/evidence/pool.go +++ b/evidence/pool.go @@ -11,13 +11,13 @@ import ( "github.com/cosmos/gogoproto/proto" gogotypes "github.com/cosmos/gogoproto/types" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - clist "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + clist "git.cw.tr/mukan-network/mukan-consensus/libs/clist" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/evidence/pool_test.go b/evidence/pool_test.go index 29ccbac..99dcd17 100644 --- a/evidence/pool_test.go +++ b/evidence/pool_test.go @@ -9,18 +9,18 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/evidence/mocks" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - sm "github.com/cometbft/cometbft/state" - smmocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/evidence/mocks" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + smmocks "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) func TestMain(m *testing.M) { diff --git a/evidence/reactor.go b/evidence/reactor.go index 661187d..5ebfa41 100644 --- a/evidence/reactor.go +++ b/evidence/reactor.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/gogoproto/proto" - clist "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + clist "git.cw.tr/mukan-network/mukan-consensus/libs/clist" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/evidence/reactor_test.go b/evidence/reactor_test.go index f5c8f92..2c41af5 100644 --- a/evidence/reactor_test.go +++ b/evidence/reactor_test.go @@ -13,19 +13,19 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/evidence/mocks" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/evidence/mocks" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + p2pmocks "git.cw.tr/mukan-network/mukan-consensus/p2p/mocks" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var ( diff --git a/evidence/services.go b/evidence/services.go index 59c4e84..e8a678b 100644 --- a/evidence/services.go +++ b/evidence/services.go @@ -1,7 +1,7 @@ package evidence import ( - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //go:generate ../scripts/mockery_generate.sh BlockStore diff --git a/evidence/verify.go b/evidence/verify.go index 2e7aec0..1f904d3 100644 --- a/evidence/verify.go +++ b/evidence/verify.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // verify verifies the evidence fully by checking: diff --git a/evidence/verify_test.go b/evidence/verify_test.go index d068259..2bf0612 100644 --- a/evidence/verify_test.go +++ b/evidence/verify_test.go @@ -8,20 +8,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/evidence/mocks" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - sm "github.com/cometbft/cometbft/state" - smmocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/evidence/mocks" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + smmocks "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const ( diff --git a/inspect/inspect.go b/inspect/inspect.go index 38dd4bd..67a9b47 100644 --- a/inspect/inspect.go +++ b/inspect/inspect.go @@ -6,17 +6,17 @@ import ( "net" "os" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/inspect/rpc" - "github.com/cometbft/cometbft/libs/log" - cmtstrings "github.com/cometbft/cometbft/libs/strings" - rpccore "github.com/cometbft/cometbft/rpc/core" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/indexer/block" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/inspect/rpc" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtstrings "git.cw.tr/mukan-network/mukan-consensus/libs/strings" + rpccore "git.cw.tr/mukan-network/mukan-consensus/rpc/core" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" "golang.org/x/sync/errgroup" ) diff --git a/inspect/inspect_test.go b/inspect/inspect_test.go index afbf843..6b39ea4 100644 --- a/inspect/inspect_test.go +++ b/inspect/inspect_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - abcitypes "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/inspect" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/pubsub/query" - httpclient "github.com/cometbft/cometbft/rpc/client/http" - indexermocks "github.com/cometbft/cometbft/state/indexer/mocks" - statemocks "github.com/cometbft/cometbft/state/mocks" - txindexmocks "github.com/cometbft/cometbft/state/txindex/mocks" - "github.com/cometbft/cometbft/types" + abcitypes "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/inspect" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + httpclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + indexermocks "git.cw.tr/mukan-network/mukan-consensus/state/indexer/mocks" + statemocks "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + txindexmocks "git.cw.tr/mukan-network/mukan-consensus/state/txindex/mocks" + "git.cw.tr/mukan-network/mukan-consensus/types" "github.com/fortytw2/leaktest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -257,7 +257,7 @@ func TestBlockResults(t *testing.T) { testGasUsed := int64(100) stateStoreMock := &statemocks.Store{} stateStoreMock.On("Close").Return(nil) - // cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" + // cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" stateStoreMock.On("LoadFinalizeBlockResponse", testHeight).Return(&abcitypes.ResponseFinalizeBlock{ TxResults: []*abcitypes.ExecTxResult{ { diff --git a/inspect/rpc/rpc.go b/inspect/rpc/rpc.go index 6ef69a5..f0861a9 100644 --- a/inspect/rpc/rpc.go +++ b/inspect/rpc/rpc.go @@ -7,13 +7,13 @@ import ( "github.com/rs/cors" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/rpc/core" - "github.com/cometbft/cometbft/rpc/jsonrpc/server" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/rpc/core" + "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" ) // Server defines parameters for running an Inspector rpc server. diff --git a/internal/indexer/indexer_utils.go b/internal/indexer/indexer_utils.go index 21848eb..0bc205f 100644 --- a/internal/indexer/indexer_utils.go +++ b/internal/indexer/indexer_utils.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/cometbft/cometbft/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" ) // If the actual event value is a float, we get the condition and parse it as a float diff --git a/internal/test/block.go b/internal/test/block.go index 9137918..a8f14fa 100644 --- a/internal/test/block.go +++ b/internal/test/block.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const ( diff --git a/internal/test/commit.go b/internal/test/commit.go index fc7d6fc..b052661 100644 --- a/internal/test/commit.go +++ b/internal/test/commit.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func MakeCommitFromVoteSet(blockID types.BlockID, voteSet *types.VoteSet, validators []types.PrivValidator, now time.Time) (*types.Commit, error) { diff --git a/internal/test/config.go b/internal/test/config.go index 8b4abb0..82cfd04 100644 --- a/internal/test/config.go +++ b/internal/test/config.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/cometbft/cometbft/config" - cmtos "github.com/cometbft/cometbft/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/config" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" ) func ResetTestRoot(testName string) *config.Config { diff --git a/internal/test/factory_test.go b/internal/test/factory_test.go index 852c115..8890f9c 100644 --- a/internal/test/factory_test.go +++ b/internal/test/factory_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestMakeHeader(t *testing.T) { diff --git a/internal/test/genesis.go b/internal/test/genesis.go index 5af1e01..c842ab9 100644 --- a/internal/test/genesis.go +++ b/internal/test/genesis.go @@ -3,7 +3,7 @@ package test import ( "time" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func GenesisDoc( diff --git a/internal/test/params.go b/internal/test/params.go index ebfdbc8..9f12934 100644 --- a/internal/test/params.go +++ b/internal/test/params.go @@ -1,7 +1,7 @@ package test import ( - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // ConsensusParams returns a default set of ConsensusParams that are suitable diff --git a/internal/test/tx.go b/internal/test/tx.go index 36b077f..e2b3cca 100644 --- a/internal/test/tx.go +++ b/internal/test/tx.go @@ -1,6 +1,6 @@ package test -import "github.com/cometbft/cometbft/types" +import "git.cw.tr/mukan-network/mukan-consensus/types" func MakeNTxs(height, n int64) types.Txs { txs := make([]types.Tx, n) diff --git a/internal/test/validator.go b/internal/test/validator.go index e9c46ef..fc688f2 100644 --- a/internal/test/validator.go +++ b/internal/test/validator.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func Validator(_ context.Context, votingPower int64) (*types.Validator, types.PrivValidator, error) { diff --git a/libs/autofile/autofile.go b/libs/autofile/autofile.go index 798d911..bb9ce03 100644 --- a/libs/autofile/autofile.go +++ b/libs/autofile/autofile.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) /* AutoFile usage diff --git a/libs/autofile/autofile_test.go b/libs/autofile/autofile_test.go index 7588250..7254916 100644 --- a/libs/autofile/autofile_test.go +++ b/libs/autofile/autofile_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtos "github.com/cometbft/cometbft/libs/os" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" ) func TestSIGHUP(t *testing.T) { diff --git a/libs/autofile/cmd/logjack.go b/libs/autofile/cmd/logjack.go index e58e129..f12fff0 100644 --- a/libs/autofile/cmd/logjack.go +++ b/libs/autofile/cmd/logjack.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - auto "github.com/cometbft/cometbft/libs/autofile" - cmtos "github.com/cometbft/cometbft/libs/os" + auto "git.cw.tr/mukan-network/mukan-consensus/libs/autofile" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" ) const ( diff --git a/libs/autofile/group.go b/libs/autofile/group.go index f1240a5..4998b09 100644 --- a/libs/autofile/group.go +++ b/libs/autofile/group.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) const ( diff --git a/libs/autofile/group_test.go b/libs/autofile/group_test.go index 1d72f02..bffb8e9 100644 --- a/libs/autofile/group_test.go +++ b/libs/autofile/group_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) func createTestGroupWithHeadSizeLimit(t *testing.T, headSizeLimit int64) *Group { diff --git a/libs/bits/bit_array.go b/libs/bits/bit_array.go index a9f6169..41bfb8b 100644 --- a/libs/bits/bit_array.go +++ b/libs/bits/bit_array.go @@ -8,9 +8,9 @@ import ( "strings" "sync" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtprotobits "github.com/cometbft/cometbft/proto/tendermint/libs/bits" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtprotobits "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/libs/bits" ) // BitArray is a thread-safe implementation of a bit array. diff --git a/libs/bits/bit_array_test.go b/libs/bits/bit_array_test.go index 97a1712..861b3ad 100644 --- a/libs/bits/bit_array_test.go +++ b/libs/bits/bit_array_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) var ( @@ -420,7 +420,7 @@ func TestBitArrayValidateBasic(t *testing.T) { } // Tests that UnmarshalJSON doesn't crash when no bits are passed into the JSON. -// See issue https://github.com/cometbft/cometbft/issues/2658 +// See issue https://git.cw.tr/mukan-network/mukan-consensus/issues/2658 func TestUnmarshalJSONDoesntCrashOnZeroBits(t *testing.T) { type indexCorpus struct { BitArray *BitArray `json:"ba"` diff --git a/libs/cli/flags/log_level.go b/libs/cli/flags/log_level.go index b31eb7d..08407ab 100644 --- a/libs/cli/flags/log_level.go +++ b/libs/cli/flags/log_level.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) const ( diff --git a/libs/cli/flags/log_level_test.go b/libs/cli/flags/log_level_test.go index 620e3e8..f552725 100644 --- a/libs/cli/flags/log_level_test.go +++ b/libs/cli/flags/log_level_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - "github.com/cometbft/cometbft/libs/log" + cmtflags "git.cw.tr/mukan-network/mukan-consensus/libs/cli/flags" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) const ( diff --git a/libs/clist/clist.go b/libs/clist/clist.go index b2e1d78..07ce93d 100644 --- a/libs/clist/clist.go +++ b/libs/clist/clist.go @@ -15,7 +15,7 @@ import ( "fmt" "sync" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // MaxLength is the max allowed number of elements a linked list is diff --git a/libs/clist/clist_test.go b/libs/clist/clist_test.go index a5cd42f..39a7dd1 100644 --- a/libs/clist/clist_test.go +++ b/libs/clist/clist_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) func TestPanicOnMaxLength(t *testing.T) { diff --git a/libs/cmap/cmap.go b/libs/cmap/cmap.go index 69e6b8e..1fc3ea6 100644 --- a/libs/cmap/cmap.go +++ b/libs/cmap/cmap.go @@ -1,7 +1,7 @@ package cmap import ( - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // CMap is a goroutine-safe map diff --git a/libs/events/events.go b/libs/events/events.go index d4e41c7..66bbf6b 100644 --- a/libs/events/events.go +++ b/libs/events/events.go @@ -4,8 +4,8 @@ package events import ( "fmt" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // ErrListenerWasRemoved is returned by AddEvent if the listener was removed. diff --git a/libs/events/events_test.go b/libs/events/events_test.go index c54eb5d..4260572 100644 --- a/libs/events/events_test.go +++ b/libs/events/events_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) // TestAddListenerForEventFireOnce sets up an EventSwitch, subscribes a single diff --git a/libs/flowrate/flowrate.go b/libs/flowrate/flowrate.go index 47e1948..f08d2bb 100644 --- a/libs/flowrate/flowrate.go +++ b/libs/flowrate/flowrate.go @@ -10,7 +10,7 @@ import ( "math" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // Monitor monitors and limits the transfer rate of a data stream. diff --git a/libs/json/decoder_test.go b/libs/json/decoder_test.go index 6b799de..1b2fb62 100644 --- a/libs/json/decoder_test.go +++ b/libs/json/decoder_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) func TestUnmarshal(t *testing.T) { diff --git a/libs/json/encoder_test.go b/libs/json/encoder_test.go index 7eeb896..9438c7d 100644 --- a/libs/json/encoder_test.go +++ b/libs/json/encoder_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) func TestMarshal(t *testing.T) { diff --git a/libs/json/helpers_test.go b/libs/json/helpers_test.go index 4d5b648..84fdd83 100644 --- a/libs/json/helpers_test.go +++ b/libs/json/helpers_test.go @@ -3,7 +3,7 @@ package json_test import ( "time" - "github.com/cometbft/cometbft/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) // Register Car, an instance of the Vehicle interface. diff --git a/libs/json/structs.go b/libs/json/structs.go index ba6720f..31571cd 100644 --- a/libs/json/structs.go +++ b/libs/json/structs.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) var ( diff --git a/libs/json/types.go b/libs/json/types.go index 74212b0..b1e71f6 100644 --- a/libs/json/types.go +++ b/libs/json/types.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) var ( diff --git a/libs/log/filter_test.go b/libs/log/filter_test.go index f8e8144..46f3e79 100644 --- a/libs/log/filter_test.go +++ b/libs/log/filter_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) func TestVariousLevels(t *testing.T) { diff --git a/libs/log/lazy.go b/libs/log/lazy.go index ddf170e..d7c4d6b 100644 --- a/libs/log/lazy.go +++ b/libs/log/lazy.go @@ -3,7 +3,7 @@ package log import ( "fmt" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" ) type LazySprintf struct { diff --git a/libs/log/tm_logger_test.go b/libs/log/tm_logger_test.go index 43635c3..03ad148 100644 --- a/libs/log/tm_logger_test.go +++ b/libs/log/tm_logger_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) func TestLoggerLogsItsErrors(t *testing.T) { diff --git a/libs/log/tmfmt_logger_test.go b/libs/log/tmfmt_logger_test.go index 118c895..b9dbc22 100644 --- a/libs/log/tmfmt_logger_test.go +++ b/libs/log/tmfmt_logger_test.go @@ -11,7 +11,7 @@ import ( kitlog "github.com/go-kit/log" "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) func TestTMFmtLogger(t *testing.T) { diff --git a/libs/log/tracing_logger_test.go b/libs/log/tracing_logger_test.go index 61c88e5..bc81b79 100644 --- a/libs/log/tracing_logger_test.go +++ b/libs/log/tracing_logger_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) func TestTracingLogger(t *testing.T) { diff --git a/libs/os/os.go b/libs/os/os.go index cf88589..817a2ce 100644 --- a/libs/os/os.go +++ b/libs/os/os.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) type logger interface { diff --git a/libs/protoio/io_test.go b/libs/protoio/io_test.go index 0413bc0..8d4a49f 100644 --- a/libs/protoio/io_test.go +++ b/libs/protoio/io_test.go @@ -41,7 +41,7 @@ import ( "github.com/cosmos/gogoproto/test" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" ) func iotest(writer protoio.WriteCloser, reader protoio.ReadCloser) error { diff --git a/libs/pubsub/example_test.go b/libs/pubsub/example_test.go index 0c380bc..9908d65 100644 --- a/libs/pubsub/example_test.go +++ b/libs/pubsub/example_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" - "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" ) func TestExample(t *testing.T) { diff --git a/libs/pubsub/pubsub.go b/libs/pubsub/pubsub.go index 2750107..b3bd6a7 100644 --- a/libs/pubsub/pubsub.go +++ b/libs/pubsub/pubsub.go @@ -38,8 +38,8 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) type operation int diff --git a/libs/pubsub/pubsub_test.go b/libs/pubsub/pubsub_test.go index 3a30ab2..aeb5af7 100644 --- a/libs/pubsub/pubsub_test.go +++ b/libs/pubsub/pubsub_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" - "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" ) const ( diff --git a/libs/pubsub/query/bench_test.go b/libs/pubsub/query/bench_test.go index cc0554a..f50303d 100644 --- a/libs/pubsub/query/bench_test.go +++ b/libs/pubsub/query/bench_test.go @@ -3,7 +3,7 @@ package query_test import ( "testing" - "github.com/cometbft/cometbft/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" ) const testQuery = `tm.events.type='NewBlock' AND abci.account.name='Igor'` diff --git a/libs/pubsub/query/query.go b/libs/pubsub/query/query.go index a6a1aeb..e999c2f 100644 --- a/libs/pubsub/query/query.go +++ b/libs/pubsub/query/query.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" ) // All is a query that matches all events. diff --git a/libs/pubsub/query/query_test.go b/libs/pubsub/query/query_test.go index afe650e..b4feb0b 100644 --- a/libs/pubsub/query/query_test.go +++ b/libs/pubsub/query/query_test.go @@ -10,17 +10,17 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" ) var _ pubsub.Query = (*query.Query)(nil) // Example events from the OpenAPI documentation: // -// https://github.com/cometbft/cometbft/blob/master/rpc/openapi/openapi.yaml +// https://git.cw.tr/mukan-network/mukan-consensus/blob/master/rpc/openapi/openapi.yaml // // Redactions: // diff --git a/libs/pubsub/query/syntax/syntax_test.go b/libs/pubsub/query/syntax/syntax_test.go index a0cd098..69ab21b 100644 --- a/libs/pubsub/query/syntax/syntax_test.go +++ b/libs/pubsub/query/syntax/syntax_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" ) func TestScanner(t *testing.T) { diff --git a/libs/pubsub/subscription.go b/libs/pubsub/subscription.go index c0b604b..50155ce 100644 --- a/libs/pubsub/subscription.go +++ b/libs/pubsub/subscription.go @@ -3,7 +3,7 @@ package pubsub import ( "errors" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) var ( diff --git a/libs/rand/random.go b/libs/rand/random.go index a764d0e..dcfbe66 100644 --- a/libs/rand/random.go +++ b/libs/rand/random.go @@ -5,7 +5,7 @@ import ( mrand "math/rand" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) const ( @@ -301,7 +301,7 @@ func (r *Rand) Perm(n int) []int { // NOTE: This relies on the os's random number generator. // For real security, we should salt that with some seed. -// See github.com/cometbft/cometbft/crypto for a more secure reader. +// See git.cw.tr/mukan-network/mukan-consensus/crypto for a more secure reader. func cRandBytes(numBytes int) []byte { b := make([]byte, numBytes) _, err := crand.Read(b) diff --git a/libs/service/service.go b/libs/service/service.go index 9db6f2f..7607a8b 100644 --- a/libs/service/service.go +++ b/libs/service/service.go @@ -5,7 +5,7 @@ import ( "fmt" "sync/atomic" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) var ( diff --git a/libs/tempfile/tempfile.go b/libs/tempfile/tempfile.go index 1d61c7a..c030a29 100644 --- a/libs/tempfile/tempfile.go +++ b/libs/tempfile/tempfile.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) const ( diff --git a/libs/tempfile/tempfile_test.go b/libs/tempfile/tempfile_test.go index 87124bd..66fb580 100644 --- a/libs/tempfile/tempfile_test.go +++ b/libs/tempfile/tempfile_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) func TestWriteFileAtomic(t *testing.T) { diff --git a/libs/test/mutate.go b/libs/test/mutate.go index d36ce04..d79266d 100644 --- a/libs/test/mutate.go +++ b/libs/test/mutate.go @@ -1,7 +1,7 @@ package test import ( - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) // Contract: !bytes.Equal(input, output) && len(input) >= len(output) diff --git a/libs/timer/throttle_timer.go b/libs/timer/throttle_timer.go index 60672c5..93366b4 100644 --- a/libs/timer/throttle_timer.go +++ b/libs/timer/throttle_timer.go @@ -3,7 +3,7 @@ package timer import ( "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) /* diff --git a/libs/timer/throttle_timer_test.go b/libs/timer/throttle_timer_test.go index f2c9338..cdb55b2 100644 --- a/libs/timer/throttle_timer_test.go +++ b/libs/timer/throttle_timer_test.go @@ -8,7 +8,7 @@ import ( asrt "github.com/stretchr/testify/assert" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) type thCounter struct { diff --git a/light/client.go b/light/client.go index 11e179f..a3f8250 100644 --- a/light/client.go +++ b/light/client.go @@ -9,12 +9,12 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/light/store" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + "git.cw.tr/mukan-network/mukan-consensus/light/store" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type mode byte @@ -506,7 +506,7 @@ func (c *Client) VerifyLightBlockAtHeight(ctx context.Context, height int64, now // headers are not adjacent, verifySkipping is performed and necessary (not all) // intermediate headers will be requested. See the specification for details. // Intermediate headers are not saved to database. -// https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/light-client.md +// https://git.cw.tr/mukan-network/mukan-consensus/blob/v0.38.x/spec/consensus/light-client.md // // If the header, which is older than the currently trusted header, is // requested and the light client does not have it, VerifyHeader will perform: diff --git a/light/client_benchmark_test.go b/light/client_benchmark_test.go index 08e866d..eb0f8e7 100644 --- a/light/client_benchmark_test.go +++ b/light/client_benchmark_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - mockp "github.com/cometbft/cometbft/light/provider/mock" - dbs "github.com/cometbft/cometbft/light/store/db" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + mockp "git.cw.tr/mukan-network/mukan-consensus/light/provider/mock" + dbs "git.cw.tr/mukan-network/mukan-consensus/light/store/db" ) // NOTE: block is produced every minute. Make sure the verification time diff --git a/light/client_test.go b/light/client_test.go index 6e0c5e3..0963eda 100644 --- a/light/client_test.go +++ b/light/client_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - mockp "github.com/cometbft/cometbft/light/provider/mock" - dbs "github.com/cometbft/cometbft/light/store/db" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + mockp "git.cw.tr/mukan-network/mukan-consensus/light/provider/mock" + dbs "git.cw.tr/mukan-network/mukan-consensus/light/store/db" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/light/detector.go b/light/detector.go index f7634b1..830a529 100644 --- a/light/detector.go +++ b/light/detector.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // The detector component of the light client detects and handles attacks on the light client. @@ -258,7 +258,7 @@ func (c *Client) handleConflictingHeaders( if primaryBlock.Commit.Round != witnessTrace[len(witnessTrace)-1].Commit.Round { c.logger.Info("The light client has detected, and prevented, an attempted amnesia attack." + " We think this attack is pretty unlikely, so if you see it, that's interesting to us." + - " Can you let us know by opening an issue through https://github.com/cometbft/cometbft/issues/new?") + " Can you let us know by opening an issue through https://git.cw.tr/mukan-network/mukan-consensus/issues/new?") } // This may not be valid because the witness itself is at fault. So now we reverse it, examining the diff --git a/light/detector_test.go b/light/detector_test.go index ca86e1d..0770cb2 100644 --- a/light/detector_test.go +++ b/light/detector_test.go @@ -7,14 +7,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - mockp "github.com/cometbft/cometbft/light/provider/mock" - dbs "github.com/cometbft/cometbft/light/store/db" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + mockp "git.cw.tr/mukan-network/mukan-consensus/light/provider/mock" + dbs "git.cw.tr/mukan-network/mukan-consensus/light/store/db" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestLightClientAttackEvidence_Lunatic(t *testing.T) { diff --git a/light/doc.go b/light/doc.go index c9f7c75..71929ed 100644 --- a/light/doc.go +++ b/light/doc.go @@ -94,7 +94,7 @@ Check out other examples in example_test.go ## 2. Pure functions to verify a new header (see verifier.go) Verify function verifies a new header against some trusted header. See -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/README.md +https://git.cw.tr/mukan-network/mukan-consensus/blob/v0.38.x/spec/light-client/verification/README.md for details. There are two methods of verification: sequential and bisection @@ -121,7 +121,7 @@ See https://docs.cometbft.com/v0.38.x/core/light-client.html for usage example. Or see -https://github.com/cometbft/cometbft/tree/v0.38.x/spec/consensus/light-client +https://git.cw.tr/mukan-network/mukan-consensus/tree/v0.38.x/spec/consensus/light-client for the full spec */ package light diff --git a/light/errors.go b/light/errors.go index d47a786..e47f7fd 100644 --- a/light/errors.go +++ b/light/errors.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // ErrOldHeaderExpired means the old (trusted) header has expired according to diff --git a/light/example_test.go b/light/example_test.go index 810bc81..05ed1aa 100644 --- a/light/example_test.go +++ b/light/example_test.go @@ -8,15 +8,15 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - httpp "github.com/cometbft/cometbft/light/provider/http" - dbs "github.com/cometbft/cometbft/light/store/db" - rpctest "github.com/cometbft/cometbft/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + httpp "git.cw.tr/mukan-network/mukan-consensus/light/provider/http" + dbs "git.cw.tr/mukan-network/mukan-consensus/light/store/db" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" ) // Automatically getting new headers and verifying them. diff --git a/light/helpers_test.go b/light/helpers_test.go index a061e27..1b92430 100644 --- a/light/helpers_test.go +++ b/light/helpers_test.go @@ -3,14 +3,14 @@ package light_test import ( "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // privKeys is a helper type for testing. diff --git a/light/provider/http/http.go b/light/provider/http/http.go index bac51dc..a61c90a 100644 --- a/light/provider/http/http.go +++ b/light/provider/http/http.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/light/provider" - rpcclient "github.com/cometbft/cometbft/rpc/client" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var ( @@ -180,7 +180,7 @@ func (p *http) signedHeader(ctx context.Context, height *int64) (*types.SignedHe commit, err := p.client.Commit(ctx, height) switch { case err == nil: - // See https://github.com/cometbft/cometbft/issues/575 + // See https://git.cw.tr/mukan-network/mukan-consensus/issues/575 // If the node is starting at a non-zero height, but does not yet // have any blocks, it can return an empty signed header without // returning an error. diff --git a/light/provider/http/http_test.go b/light/provider/http/http_test.go index 26a184f..77bce38 100644 --- a/light/provider/http/http_test.go +++ b/light/provider/http/http_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/light/provider" - lighthttp "github.com/cometbft/cometbft/light/provider/http" - rpcclient "github.com/cometbft/cometbft/rpc/client" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpctest "github.com/cometbft/cometbft/rpc/test" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + lighthttp "git.cw.tr/mukan-network/mukan-consensus/light/provider/http" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestNewProvider(t *testing.T) { diff --git a/light/provider/mock/deadmock.go b/light/provider/mock/deadmock.go index 18fd9f7..412c6fe 100644 --- a/light/provider/mock/deadmock.go +++ b/light/provider/mock/deadmock.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type deadMock struct { diff --git a/light/provider/mock/mock.go b/light/provider/mock/mock.go index 126d84b..35f59c1 100644 --- a/light/provider/mock/mock.go +++ b/light/provider/mock/mock.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type Mock struct { diff --git a/light/provider/provider.go b/light/provider/provider.go index 27e8978..fba77f5 100644 --- a/light/provider/provider.go +++ b/light/provider/provider.go @@ -3,7 +3,7 @@ package provider import ( "context" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Provider provides information for the light client to sync (verification diff --git a/light/proxy/proxy.go b/light/proxy/proxy.go index 9477d2f..3a04a35 100644 --- a/light/proxy/proxy.go +++ b/light/proxy/proxy.go @@ -6,12 +6,12 @@ import ( "net" "net/http" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/light" - lrpc "github.com/cometbft/cometbft/light/rpc" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/light" + lrpc "git.cw.tr/mukan-network/mukan-consensus/light/rpc" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" ) // A Proxy defines parameters for running an HTTP server proxy. diff --git a/light/proxy/routes.go b/light/proxy/routes.go index 1e197d2..47c1e41 100644 --- a/light/proxy/routes.go +++ b/light/proxy/routes.go @@ -1,13 +1,13 @@ package proxy import ( - "github.com/cometbft/cometbft/libs/bytes" - lrpc "github.com/cometbft/cometbft/light/rpc" - rpcclient "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + lrpc "git.cw.tr/mukan-network/mukan-consensus/light/rpc" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func RPCRoutes(c *lrpc.Client) map[string]*rpcserver.RPCFunc { diff --git a/light/rpc/client.go b/light/rpc/client.go index e625896..00e3704 100644 --- a/light/rpc/client.go +++ b/light/rpc/client.go @@ -8,15 +8,15 @@ import ( "regexp" "time" - "github.com/cometbft/cometbft/crypto/merkle" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtmath "github.com/cometbft/cometbft/libs/math" - service "github.com/cometbft/cometbft/libs/service" - rpcclient "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + service "git.cw.tr/mukan-network/mukan-consensus/libs/service" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var errNegOrZeroHeight = errors.New("negative or zero height") diff --git a/light/rpc/mocks/light_client.go b/light/rpc/mocks/light_client.go index fcebe7a..6782936 100644 --- a/light/rpc/mocks/light_client.go +++ b/light/rpc/mocks/light_client.go @@ -9,7 +9,7 @@ import ( time "time" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // LightClient is an autogenerated mock type for the LightClient type diff --git a/light/setup.go b/light/setup.go index 682f29e..3a1c7da 100644 --- a/light/setup.go +++ b/light/setup.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/light/provider/http" - "github.com/cometbft/cometbft/light/store" + "git.cw.tr/mukan-network/mukan-consensus/light/provider" + "git.cw.tr/mukan-network/mukan-consensus/light/provider/http" + "git.cw.tr/mukan-network/mukan-consensus/light/store" ) // NewHTTPClient initiates an instance of a light client using HTTP addresses diff --git a/light/store/db/db.go b/light/store/db/db.go index 78fa573..fb8cd71 100644 --- a/light/store/db/db.go +++ b/light/store/db/db.go @@ -6,12 +6,12 @@ import ( "regexp" "strconv" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light/store" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/light/store" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var sizeKey = []byte("size") diff --git a/light/store/db/db_test.go b/light/store/db/db_test.go index 62e635d..9e5b05b 100644 --- a/light/store/db/db_test.go +++ b/light/store/db/db_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) func TestLast_FirstLightBlockHeight(t *testing.T) { diff --git a/light/store/store.go b/light/store/store.go index d65239b..aa5edb5 100644 --- a/light/store/store.go +++ b/light/store/store.go @@ -1,6 +1,6 @@ package store -import "github.com/cometbft/cometbft/types" +import "git.cw.tr/mukan-network/mukan-consensus/types" // Store is anything that can persistently store headers. type Store interface { diff --git a/light/trust_options.go b/light/trust_options.go index a5d80d0..3c6c58b 100644 --- a/light/trust_options.go +++ b/light/trust_options.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" ) // TrustOptions are the trust parameters needed when a new light client diff --git a/light/verifier.go b/light/verifier.go index 721a7de..8b1c283 100644 --- a/light/verifier.go +++ b/light/verifier.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/types" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var ( diff --git a/light/verifier_test.go b/light/verifier_test.go index 788c30d..2830000 100644 --- a/light/verifier_test.go +++ b/light/verifier_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/types" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/mempool/bench_test.go b/mempool/bench_test.go index 35fe5c4..1f8872a 100644 --- a/mempool/bench_test.go +++ b/mempool/bench_test.go @@ -4,8 +4,8 @@ import ( "sync/atomic" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/proxy" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/proxy" "github.com/stretchr/testify/require" ) diff --git a/mempool/cache.go b/mempool/cache.go index 9a7802f..b6a4bbc 100644 --- a/mempool/cache.go +++ b/mempool/cache.go @@ -3,8 +3,8 @@ package mempool import ( "container/list" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/types" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // TxCache defines an interface for raw transaction caching in a mempool. diff --git a/mempool/cache_test.go b/mempool/cache_test.go index b6951b8..b649a95 100644 --- a/mempool/cache_test.go +++ b/mempool/cache_test.go @@ -7,10 +7,10 @@ import ( "fmt" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + "git.cw.tr/mukan-network/mukan-consensus/types" "github.com/stretchr/testify/require" ) diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index 4eea9a0..083c146 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -8,14 +8,14 @@ import ( "sync/atomic" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/clist" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // CListMempool is an ordered in-memory pool for transactions before they are diff --git a/mempool/clist_mempool_test.go b/mempool/clist_mempool_test.go index 09e7ab0..19efaec 100644 --- a/mempool/clist_mempool_test.go +++ b/mempool/clist_mempool_test.go @@ -17,18 +17,18 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abciclient "github.com/cometbft/cometbft/abci/client" - abciclimocks "github.com/cometbft/cometbft/abci/client/mocks" - "github.com/cometbft/cometbft/abci/example/kvstore" - abciserver "github.com/cometbft/cometbft/abci/server" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abciclient "git.cw.tr/mukan-network/mukan-consensus/abci/client" + abciclimocks "git.cw.tr/mukan-network/mukan-consensus/abci/client/mocks" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abciserver "git.cw.tr/mukan-network/mukan-consensus/abci/server" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // A cleanupFunc cleans up any config / test files created for a particular @@ -927,7 +927,7 @@ func TestMempoolAsyncRecheckTxReturnError(t *testing.T) { mockClient.AssertExpectations(t) } -// This test used to cause a data race when rechecking (see https://github.com/cometbft/cometbft/issues/1827). +// This test used to cause a data race when rechecking (see https://git.cw.tr/mukan-network/mukan-consensus/issues/1827). func TestMempoolRecheckRace(t *testing.T) { mp, cleanup := newMempoolWithAsyncConnection(t) defer cleanup() diff --git a/mempool/ids.go b/mempool/ids.go index 36ff87d..5abaed5 100644 --- a/mempool/ids.go +++ b/mempool/ids.go @@ -3,8 +3,8 @@ package mempool import ( "fmt" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) type mempoolIDs struct { diff --git a/mempool/ids_test.go b/mempool/ids_test.go index 3ab6a12..453b798 100644 --- a/mempool/ids_test.go +++ b/mempool/ids_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/cometbft/cometbft/p2p/mock" + "git.cw.tr/mukan-network/mukan-consensus/p2p/mock" "github.com/stretchr/testify/assert" ) diff --git a/mempool/mempool.go b/mempool/mempool.go index 36edba1..715b1d1 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -5,8 +5,8 @@ import ( "fmt" "math" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/mempool/mempoolTx.go b/mempool/mempoolTx.go index b387b4b..ac45c58 100644 --- a/mempool/mempoolTx.go +++ b/mempool/mempoolTx.go @@ -4,7 +4,7 @@ import ( "sync" "sync/atomic" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // mempoolTx is an entry in the mempool diff --git a/mempool/mocks/mempool.go b/mempool/mocks/mempool.go index 5b19e27..afdd685 100644 --- a/mempool/mocks/mempool.go +++ b/mempool/mocks/mempool.go @@ -3,12 +3,12 @@ package mocks import ( - abcitypes "github.com/cometbft/cometbft/abci/types" - mempool "github.com/cometbft/cometbft/mempool" + abcitypes "git.cw.tr/mukan-network/mukan-consensus/abci/types" + mempool "git.cw.tr/mukan-network/mukan-consensus/mempool" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // Mempool is an autogenerated mock type for the Mempool type diff --git a/mempool/nop_mempool.go b/mempool/nop_mempool.go index 38f80ea..dc8740f 100644 --- a/mempool/nop_mempool.go +++ b/mempool/nop_mempool.go @@ -3,10 +3,10 @@ package mempool import ( "errors" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // NopMempool is a mempool that does nothing. diff --git a/mempool/nop_mempool_test.go b/mempool/nop_mempool_test.go index 51169e5..9536f80 100644 --- a/mempool/nop_mempool_test.go +++ b/mempool/nop_mempool_test.go @@ -3,7 +3,7 @@ package mempool import ( "testing" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" "github.com/stretchr/testify/assert" ) diff --git a/mempool/reactor.go b/mempool/reactor.go index 304db98..70fe4e6 100644 --- a/mempool/reactor.go +++ b/mempool/reactor.go @@ -7,12 +7,12 @@ import ( "fmt" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - protomem "github.com/cometbft/cometbft/proto/tendermint/mempool" - "github.com/cometbft/cometbft/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/clist" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + protomem "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/mempool" + "git.cw.tr/mukan-network/mukan-consensus/types" "golang.org/x/sync/semaphore" ) diff --git a/mempool/reactor_test.go b/mempool/reactor_test.go index 90eda3c..9b7ddfd 100644 --- a/mempool/reactor_test.go +++ b/mempool/reactor_test.go @@ -12,15 +12,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/mock" - memproto "github.com/cometbft/cometbft/proto/tendermint/mempool" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/mock" + memproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/mempool" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( @@ -63,7 +63,7 @@ func TestReactorBroadcastTxsMessage(t *testing.T) { waitForTxsOnReactors(t, txs, reactors) } -// regression test for https://github.com/cometbft/cometbft/issues/5408 +// regression test for https://git.cw.tr/mukan-network/mukan-consensus/issues/5408 func TestReactorConcurrency(t *testing.T) { config := cfg.TestConfig() const N = 2 @@ -233,7 +233,7 @@ func TestBroadcastTxForPeerStopsWhenReactorStops(t *testing.T) { // TODO: This test tests that we don't panic and are able to generate new // PeerIDs for each peer we add. It seems as though we should be able to test // this in a much more direct way. -// https://github.com/cometbft/cometbft/issues/9639 +// https://git.cw.tr/mukan-network/mukan-consensus/issues/9639 func TestDontExhaustMaxActiveIDs(t *testing.T) { config := cfg.TestConfig() const N = 1 diff --git a/mempool/tx.go b/mempool/tx.go index f232be8..e26f400 100644 --- a/mempool/tx.go +++ b/mempool/tx.go @@ -1,7 +1,7 @@ package mempool import ( - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // TxInfo are parameters that get passed when attempting to add a tx to the diff --git a/node/node.go b/node/node.go index 8f498e4..f7223e2 100644 --- a/node/node.go +++ b/node/node.go @@ -13,31 +13,31 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/cors" - bc "github.com/cometbft/cometbft/blocksync" - cfg "github.com/cometbft/cometbft/config" - cs "github.com/cometbft/cometbft/consensus" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/light" + bc "git.cw.tr/mukan-network/mukan-consensus/blocksync" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cs "git.cw.tr/mukan-network/mukan-consensus/consensus" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/light" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/service" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/pex" - "github.com/cometbft/cometbft/proxy" - rpccore "github.com/cometbft/cometbft/rpc/core" - grpccore "github.com/cometbft/cometbft/rpc/grpc" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/null" - "github.com/cometbft/cometbft/statesync" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/pex" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + rpccore "git.cw.tr/mukan-network/mukan-consensus/rpc/core" + grpccore "git.cw.tr/mukan-network/mukan-consensus/rpc/grpc" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex/null" + "git.cw.tr/mukan-network/mukan-consensus/statesync" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" + "git.cw.tr/mukan-network/mukan-consensus/version" _ "net/http/pprof" //nolint: gosec ) diff --git a/node/node_test.go b/node/node_test.go index 4694b46..ed00234 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -13,25 +13,25 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" - p2pmock "github.com/cometbft/cometbft/p2p/mock" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" + p2pmock "git.cw.tr/mukan-network/mukan-consensus/p2p/mock" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) func TestNodeStartStop(t *testing.T) { diff --git a/node/setup.go b/node/setup.go index 87d0007..acde242 100644 --- a/node/setup.go +++ b/node/setup.go @@ -11,31 +11,31 @@ import ( _ "net/http/pprof" //nolint: gosec // securely exposed on separate, optional port - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/blocksync" - cfg "github.com/cometbft/cometbft/config" - cs "github.com/cometbft/cometbft/consensus" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/statesync" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/blocksync" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cs "git.cw.tr/mukan-network/mukan-consensus/consensus" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + "git.cw.tr/mukan-network/mukan-consensus/statesync" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/pex" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/indexer/block" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/light" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/pex" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" _ "github.com/lib/pq" // provide the psql db driver ) diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index 0e1513b..064b7ac 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -1,8 +1,8 @@ package p2p import ( - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) // Reactor is responsible for handling incoming messages on one or more diff --git a/p2p/conn/conn_notgo110.go b/p2p/conn/conn_notgo110.go index b598f99..b51ddd0 100644 --- a/p2p/conn/conn_notgo110.go +++ b/p2p/conn/conn_notgo110.go @@ -15,7 +15,7 @@ import ( // https://github.com/tendermint/tendermint/issues/851 // so for go versions < Go1.10 use our custom net.Conn creator // that doesn't return an `Unimplemented error` for net.Conn. -// Before https://github.com/cometbft/cometbft/commit/49faa79bdce5663894b3febbf4955fb1d172df04 +// Before https://git.cw.tr/mukan-network/mukan-consensus/commit/49faa79bdce5663894b3febbf4955fb1d172df04 // we hadn't cared about errors from SetDeadline so swallow them up anyways. type pipe struct { net.Conn diff --git a/p2p/conn/connection.go b/p2p/conn/connection.go index 4fb3a86..48f9a39 100644 --- a/p2p/conn/connection.go +++ b/p2p/conn/connection.go @@ -14,14 +14,14 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/config" - flow "github.com/cometbft/cometbft/libs/flowrate" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/libs/timer" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/config" + flow "git.cw.tr/mukan-network/mukan-consensus/libs/flowrate" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/libs/timer" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) const ( diff --git a/p2p/conn/connection_test.go b/p2p/conn/connection_test.go index f79dd2f..7dbd639 100644 --- a/p2p/conn/connection_test.go +++ b/p2p/conn/connection_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" - "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) const maxPingPongPacketSize = 1024 // bytes diff --git a/p2p/conn/evil_secret_connection_test.go b/p2p/conn/evil_secret_connection_test.go index 8ebfb44..a18b9d5 100644 --- a/p2p/conn/evil_secret_connection_test.go +++ b/p2p/conn/evil_secret_connection_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/crypto/chacha20poly1305" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/protoio" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) type buffer struct { diff --git a/p2p/conn/secret_connection.go b/p2p/conn/secret_connection.go index ec6d1a6..9a8ffa1 100644 --- a/p2p/conn/secret_connection.go +++ b/p2p/conn/secret_connection.go @@ -20,13 +20,13 @@ import ( "golang.org/x/crypto/hkdf" "golang.org/x/crypto/nacl/box" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/async" - "github.com/cometbft/cometbft/libs/protoio" - cmtsync "github.com/cometbft/cometbft/libs/sync" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/libs/async" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) // 4 + 1024 == 1028 total frame size @@ -52,7 +52,7 @@ var ( // SecretConnection implements net.Conn. // It is an implementation of the STS protocol. -// See https://github.com/cometbft/cometbft/blob/0.1/docs/sts-final.pdf for +// See https://git.cw.tr/mukan-network/mukan-consensus/blob/0.1/docs/sts-final.pdf for // details on the protocol. // // Consumers of the SecretConnection are responsible for authenticating diff --git a/p2p/conn/secret_connection_test.go b/p2p/conn/secret_connection_test.go index b180391..bf085f1 100644 --- a/p2p/conn/secret_connection_test.go +++ b/p2p/conn/secret_connection_test.go @@ -17,12 +17,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/sr25519" - "github.com/cometbft/cometbft/libs/async" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/sr25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/async" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) // Run go test -update from within this module diff --git a/p2p/conn_set.go b/p2p/conn_set.go index 8f4c53c..e147215 100644 --- a/p2p/conn_set.go +++ b/p2p/conn_set.go @@ -3,7 +3,7 @@ package p2p import ( "net" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // ConnSet is a lookup table for connections and all their ips. diff --git a/p2p/fuzz.go b/p2p/fuzz.go index 116b521..7dd7493 100644 --- a/p2p/fuzz.go +++ b/p2p/fuzz.go @@ -4,9 +4,9 @@ import ( "net" "time" - "github.com/cometbft/cometbft/config" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/config" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // FuzzedConnection wraps any net.Conn and depending on the mode either delays diff --git a/p2p/key.go b/p2p/key.go index ed03ad2..e112900 100644 --- a/p2p/key.go +++ b/p2p/key.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" ) // ID is a hex-encoded crypto.Address diff --git a/p2p/key_test.go b/p2p/key_test.go index 804856f..aaa5a6b 100644 --- a/p2p/key_test.go +++ b/p2p/key_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) func TestLoadOrGenNodeKey(t *testing.T) { diff --git a/p2p/mock/peer.go b/p2p/mock/peer.go index 76eae59..e731606 100644 --- a/p2p/mock/peer.go +++ b/p2p/mock/peer.go @@ -3,10 +3,10 @@ package mock import ( "net" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) type Peer struct { diff --git a/p2p/mock/reactor.go b/p2p/mock/reactor.go index 8d2e06f..c1970a3 100644 --- a/p2p/mock/reactor.go +++ b/p2p/mock/reactor.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) type Reactor struct { diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index aca4bbc..eb3bf63 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -3,14 +3,14 @@ package mocks import ( - log "github.com/cometbft/cometbft/libs/log" - conn "github.com/cometbft/cometbft/p2p/conn" + log "git.cw.tr/mukan-network/mukan-consensus/libs/log" + conn "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" mock "github.com/stretchr/testify/mock" net "net" - p2p "github.com/cometbft/cometbft/p2p" + p2p "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // Peer is an autogenerated mock type for the Peer type diff --git a/p2p/netaddress.go b/p2p/netaddress.go index f31ed02..e348844 100644 --- a/p2p/netaddress.go +++ b/p2p/netaddress.go @@ -14,7 +14,7 @@ import ( "strings" "time" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) // EmptyNetAddress defines the string representation of an empty NetAddress diff --git a/p2p/node_info.go b/p2p/node_info.go index 2b36dc0..d75ea4d 100644 --- a/p2p/node_info.go +++ b/p2p/node_info.go @@ -6,10 +6,10 @@ import ( "fmt" "reflect" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtstrings "github.com/cometbft/cometbft/libs/strings" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" - "github.com/cometbft/cometbft/version" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtstrings "git.cw.tr/mukan-network/mukan-consensus/libs/strings" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const ( diff --git a/p2p/node_info_test.go b/p2p/node_info_test.go index 781e1b0..1698c59 100644 --- a/p2p/node_info_test.go +++ b/p2p/node_info_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" ) func TestNodeInfoValidate(t *testing.T) { diff --git a/p2p/peer.go b/p2p/peer.go index fa19b08..6bc61da 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -8,11 +8,11 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/libs/cmap" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/cmap" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" - cmtconn "github.com/cometbft/cometbft/p2p/conn" + cmtconn "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) //go:generate ../scripts/mockery_generate.sh Peer diff --git a/p2p/peer_set.go b/p2p/peer_set.go index baa4373..767f404 100644 --- a/p2p/peer_set.go +++ b/p2p/peer_set.go @@ -3,7 +3,7 @@ package p2p import ( "net" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" ) // IPeerSet has a (immutable) subset of the methods of PeerSet. diff --git a/p2p/peer_set_test.go b/p2p/peer_set_test.go index 6d1d73f..16f1e0e 100644 --- a/p2p/peer_set_test.go +++ b/p2p/peer_set_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) // mockPeer for testing the PeerSet diff --git a/p2p/peer_test.go b/p2p/peer_test.go index dc4d953..3acac04 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" - "github.com/cometbft/cometbft/config" - cmtconn "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/config" + cmtconn "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) func TestPeerBasic(t *testing.T) { diff --git a/p2p/pex/addrbook.go b/p2p/pex/addrbook.go index 7368119..e15282e 100644 --- a/p2p/pex/addrbook.go +++ b/p2p/pex/addrbook.go @@ -16,13 +16,13 @@ import ( "github.com/minio/highwayhash" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) const ( diff --git a/p2p/pex/addrbook_test.go b/p2p/pex/addrbook_test.go index a475566..3a75a4b 100644 --- a/p2p/pex/addrbook_test.go +++ b/p2p/pex/addrbook_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // FIXME These tests should not rely on .(*addrBook) assertions diff --git a/p2p/pex/bench_test.go b/p2p/pex/bench_test.go index 3adb52c..8537897 100644 --- a/p2p/pex/bench_test.go +++ b/p2p/pex/bench_test.go @@ -3,7 +3,7 @@ package pex import ( "testing" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) func BenchmarkAddrBook_hash(b *testing.B) { diff --git a/p2p/pex/errors.go b/p2p/pex/errors.go index 0a2eccf..d38777c 100644 --- a/p2p/pex/errors.go +++ b/p2p/pex/errors.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) type ErrAddrBookNonRoutable struct { diff --git a/p2p/pex/file.go b/p2p/pex/file.go index 27be4af..f702942 100644 --- a/p2p/pex/file.go +++ b/p2p/pex/file.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/cometbft/cometbft/libs/tempfile" + "git.cw.tr/mukan-network/mukan-consensus/libs/tempfile" ) /* Loading & Saving */ diff --git a/p2p/pex/known_address.go b/p2p/pex/known_address.go index 8613ebd..c458eff 100644 --- a/p2p/pex/known_address.go +++ b/p2p/pex/known_address.go @@ -3,7 +3,7 @@ package pex import ( "time" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // knownAddress tracks information about a known network address diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go index 5eee9c6..e5a824d 100644 --- a/p2p/pex/pex_reactor.go +++ b/p2p/pex/pex_reactor.go @@ -6,13 +6,13 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/cmap" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/libs/cmap" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) type Peer = p2p.Peer diff --git a/p2p/pex/pex_reactor_test.go b/p2p/pex/pex_reactor_test.go index d6a5662..cff750e 100644 --- a/p2p/pex/pex_reactor_test.go +++ b/p2p/pex/pex_reactor_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/mock" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/mock" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) var cfg *config.P2PConfig @@ -304,7 +304,7 @@ func TestConnectionSpeedForPeerReceivedFromSeed(t *testing.T) { assertPeersWithTimeout(t, []*p2p.Switch{node}, 10*time.Millisecond, 1*time.Second, 2) // 6. Assert that the configured maximum number of inbound/outbound peers - // are respected, see https://github.com/cometbft/cometbft/issues/486 + // are respected, see https://git.cw.tr/mukan-network/mukan-consensus/issues/486 outbound, inbound, dialing := node.NumPeers() assert.LessOrEqual(t, inbound, cfg.MaxNumInboundPeers) assert.LessOrEqual(t, outbound, cfg.MaxNumOutboundPeers) diff --git a/p2p/switch.go b/p2p/switch.go index 7101927..4150dd3 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -8,11 +8,11 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cmap" - "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/cmap" + "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) const ( diff --git a/p2p/switch_test.go b/p2p/switch_test.go index 16bd586..5f462bc 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p/conn" - p2pproto "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" + p2pproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) var cfg *config.P2PConfig diff --git a/p2p/test_util.go b/p2p/test_util.go index 9709d69..401b366 100644 --- a/p2p/test_util.go +++ b/p2p/test_util.go @@ -5,14 +5,14 @@ import ( "net" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) const testCh = 0x01 diff --git a/p2p/transport.go b/p2p/transport.go index c26056e..f795e8f 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) const ( diff --git a/p2p/transport_test.go b/p2p/transport_test.go index ae87df6..a68f52a 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) var defaultNodeName = "host_peer" diff --git a/p2p/types.go b/p2p/types.go index f8f76ce..af5657b 100644 --- a/p2p/types.go +++ b/p2p/types.go @@ -3,8 +3,8 @@ package p2p import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" + tmp2p "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/p2p" ) type ChannelDescriptor = conn.ChannelDescriptor diff --git a/privval/file.go b/privval/file.go index fdd066e..61d451c 100644 --- a/privval/file.go +++ b/privval/file.go @@ -9,16 +9,16 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/libs/tempfile" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/libs/tempfile" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) // TODO: type ? diff --git a/privval/file_test.go b/privval/file_test.go index 5ef3a94..cdc3884 100644 --- a/privval/file_test.go +++ b/privval/file_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) func TestGenLoadValidator(t *testing.T) { diff --git a/privval/msgs.go b/privval/msgs.go index 0390a8b..8228f36 100644 --- a/privval/msgs.go +++ b/privval/msgs.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" ) // TODO: Add ChainIDRequest diff --git a/privval/msgs_test.go b/privval/msgs_test.go index 301e724..6ee52bb 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -8,14 +8,14 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - privproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cryptoproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + privproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var stamp = time.Date(2019, 10, 13, 16, 14, 44, 0, time.UTC) diff --git a/privval/retry_signer_client.go b/privval/retry_signer_client.go index 860169c..1aa1a5b 100644 --- a/privval/retry_signer_client.go +++ b/privval/retry_signer_client.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // RetrySignerClient wraps SignerClient adding retry for each operation (except diff --git a/privval/signer_client.go b/privval/signer_client.go index bdb9168..6764054 100644 --- a/privval/signer_client.go +++ b/privval/signer_client.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // SignerClient implements PrivValidator. diff --git a/privval/signer_client_test.go b/privval/signer_client_test.go index 7ccaef7..8701434 100644 --- a/privval/signer_client_test.go +++ b/privval/signer_client_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cryptoproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type signerTestCase struct { diff --git a/privval/signer_dialer_endpoint.go b/privval/signer_dialer_endpoint.go index 529b3d1..d6a4a33 100644 --- a/privval/signer_dialer_endpoint.go +++ b/privval/signer_dialer_endpoint.go @@ -3,8 +3,8 @@ package privval import ( "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) const ( diff --git a/privval/signer_endpoint.go b/privval/signer_endpoint.go index 00e5293..72f46db 100644 --- a/privval/signer_endpoint.go +++ b/privval/signer_endpoint.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" ) const ( diff --git a/privval/signer_listener_endpoint.go b/privval/signer_listener_endpoint.go index 627c26c..834f4d6 100644 --- a/privval/signer_listener_endpoint.go +++ b/privval/signer_listener_endpoint.go @@ -6,10 +6,10 @@ import ( "sync/atomic" "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" ) // SignerListenerEndpointOption sets an optional parameter on the SignerListenerEndpoint. diff --git a/privval/signer_listener_endpoint_test.go b/privval/signer_listener_endpoint_test.go index 7a0e4a2..75bb023 100644 --- a/privval/signer_listener_endpoint_test.go +++ b/privval/signer_listener_endpoint_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var ( diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go index 715836a..8e204f9 100644 --- a/privval/signer_requestHandler.go +++ b/privval/signer_requestHandler.go @@ -3,12 +3,12 @@ package privval import ( "fmt" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + cryptoproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func DefaultValidationRequestHandler( diff --git a/privval/signer_server.go b/privval/signer_server.go index b5335af..1d50d48 100644 --- a/privval/signer_server.go +++ b/privval/signer_server.go @@ -3,10 +3,10 @@ package privval import ( "io" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + privvalproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/privval" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // ValidationRequestHandlerFunc handles different remoteSigner requests diff --git a/privval/socket_dialers.go b/privval/socket_dialers.go index 49a67ab..c3e8b0d 100644 --- a/privval/socket_dialers.go +++ b/privval/socket_dialers.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/cometbft/cometbft/crypto" - cmtnet "github.com/cometbft/cometbft/libs/net" - p2pconn "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + p2pconn "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) // Socket errors. diff --git a/privval/socket_dialers_test.go b/privval/socket_dialers_test.go index 0b0ed31..8a7093a 100644 --- a/privval/socket_dialers_test.go +++ b/privval/socket_dialers_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" ) func getDialerTestCases(t *testing.T) []dialerTestCase { diff --git a/privval/socket_listeners.go b/privval/socket_listeners.go index 1e69ce6..deb96a8 100644 --- a/privval/socket_listeners.go +++ b/privval/socket_listeners.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - p2pconn "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + p2pconn "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) const ( diff --git a/privval/socket_listeners_test.go b/privval/socket_listeners_test.go index 15ebc23..485c593 100644 --- a/privval/socket_listeners_test.go +++ b/privval/socket_listeners_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" ) //------------------------------------------- diff --git a/privval/utils.go b/privval/utils.go index 58bdb42..da9edcb 100644 --- a/privval/utils.go +++ b/privval/utils.go @@ -5,9 +5,9 @@ import ( "fmt" "net" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" ) // IsConnTimeout returns a boolean indicating whether the error is known to diff --git a/proto/tendermint/blocksync/message.go b/proto/tendermint/blocksync/message.go index f336eac..a71184e 100644 --- a/proto/tendermint/blocksync/message.go +++ b/proto/tendermint/blocksync/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) var _ p2p.Wrapper = &StatusRequest{} diff --git a/proto/tendermint/blocksync/types.pb.go b/proto/tendermint/blocksync/types.pb.go index 1164b4b..0c0981b 100644 --- a/proto/tendermint/blocksync/types.pb.go +++ b/proto/tendermint/blocksync/types.pb.go @@ -5,7 +5,7 @@ package blocksync import ( fmt "fmt" - types "github.com/cometbft/cometbft/proto/tendermint/types" + types "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" diff --git a/proto/tendermint/consensus/message.go b/proto/tendermint/consensus/message.go index 74b50ed..c0540b2 100644 --- a/proto/tendermint/consensus/message.go +++ b/proto/tendermint/consensus/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) var _ p2p.Wrapper = &VoteSetBits{} diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go index cde1ec1..3aa4812 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/tendermint/consensus/types.pb.go @@ -5,8 +5,8 @@ package consensus import ( fmt "fmt" - bits "github.com/cometbft/cometbft/proto/tendermint/libs/bits" - types "github.com/cometbft/cometbft/proto/tendermint/types" + bits "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/libs/bits" + types "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/tendermint/consensus/wal.pb.go index d51552b..99b66be 100644 --- a/proto/tendermint/consensus/wal.pb.go +++ b/proto/tendermint/consensus/wal.pb.go @@ -5,7 +5,7 @@ package consensus import ( fmt "fmt" - types "github.com/cometbft/cometbft/proto/tendermint/types" + types "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" diff --git a/proto/tendermint/mempool/message.go b/proto/tendermint/mempool/message.go index 59f1335..3a8e174 100644 --- a/proto/tendermint/mempool/message.go +++ b/proto/tendermint/mempool/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) var _ p2p.Wrapper = &Txs{} diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/tendermint/p2p/conn.pb.go index 0de067a..ed44ddf 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/tendermint/p2p/conn.pb.go @@ -5,7 +5,7 @@ package p2p import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + crypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" diff --git a/proto/tendermint/privval/types.pb.go b/proto/tendermint/privval/types.pb.go index b39d513..9651e70 100644 --- a/proto/tendermint/privval/types.pb.go +++ b/proto/tendermint/privval/types.pb.go @@ -5,8 +5,8 @@ package privval import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - types "github.com/cometbft/cometbft/proto/tendermint/types" + crypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + types "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" diff --git a/proto/tendermint/rpc/grpc/types.pb.go b/proto/tendermint/rpc/grpc/types.pb.go index ee2010a..80c6af4 100644 --- a/proto/tendermint/rpc/grpc/types.pb.go +++ b/proto/tendermint/rpc/grpc/types.pb.go @@ -6,7 +6,7 @@ package coregrpc import ( context "context" fmt "fmt" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 3d326f2..49d9d7f 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -5,9 +5,9 @@ package state import ( fmt "fmt" - types "github.com/cometbft/cometbft/abci/types" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" - version "github.com/cometbft/cometbft/proto/tendermint/version" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" + types1 "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + version "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" diff --git a/proto/tendermint/statesync/message.go b/proto/tendermint/statesync/message.go index 63d6d18..fa0a81f 100644 --- a/proto/tendermint/statesync/message.go +++ b/proto/tendermint/statesync/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) var _ p2p.Wrapper = &ChunkRequest{} diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 6edc737..8e17166 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -5,8 +5,8 @@ package types import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - version "github.com/cometbft/cometbft/proto/tendermint/version" + crypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + version "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" diff --git a/proto/tendermint/types/validator.pb.go b/proto/tendermint/types/validator.pb.go index 66fa228..8baca30 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/tendermint/types/validator.pb.go @@ -5,7 +5,7 @@ package types import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + crypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 9f6c723..3bfbb1e 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -6,8 +6,8 @@ import ( "github.com/go-kit/kit/metrics" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/types" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) //go:generate ../scripts/mockery_generate.sh AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot diff --git a/proxy/app_conn_test.go b/proxy/app_conn_test.go index aa6dcf3..660ddd7 100644 --- a/proxy/app_conn_test.go +++ b/proxy/app_conn_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/abci/server" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/abci/server" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) var SOCKET = "socket" diff --git a/proxy/client.go b/proxy/client.go index f461a1d..8abfba2 100644 --- a/proxy/client.go +++ b/proxy/client.go @@ -3,11 +3,11 @@ package proxy import ( "fmt" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/abci/types" - cmtsync "github.com/cometbft/cometbft/libs/sync" - e2e "github.com/cometbft/cometbft/test/e2e/app" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/app" ) //go:generate ../scripts/mockery_generate.sh ClientCreator diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index d69e1a2..ddad43a 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) // AppConnConsensus is an autogenerated mock type for the AppConnConsensus type diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index 922bb19..674c7c1 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - abcicli "github.com/cometbft/cometbft/abci/client" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) // AppConnMempool is an autogenerated mock type for the AppConnMempool type diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go index bd71e52..add3147 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) // AppConnQuery is an autogenerated mock type for the AppConnQuery type diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go index 8b667b5..f206a41 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) // AppConnSnapshot is an autogenerated mock type for the AppConnSnapshot type diff --git a/proxy/mocks/client_creator.go b/proxy/mocks/client_creator.go index a9ee49c..3d0be02 100644 --- a/proxy/mocks/client_creator.go +++ b/proxy/mocks/client_creator.go @@ -3,7 +3,7 @@ package mocks import ( - abcicli "github.com/cometbft/cometbft/abci/client" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" mock "github.com/stretchr/testify/mock" ) diff --git a/proxy/multi_app_conn.go b/proxy/multi_app_conn.go index b241c53..1729b41 100644 --- a/proxy/multi_app_conn.go +++ b/proxy/multi_app_conn.go @@ -3,10 +3,10 @@ package proxy import ( "fmt" - abcicli "github.com/cometbft/cometbft/abci/client" - cmtlog "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/service" + abcicli "git.cw.tr/mukan-network/mukan-consensus/abci/client" + cmtlog "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) const ( diff --git a/proxy/multi_app_conn_test.go b/proxy/multi_app_conn_test.go index bf99557..f04b158 100644 --- a/proxy/multi_app_conn_test.go +++ b/proxy/multi_app_conn_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abcimocks "github.com/cometbft/cometbft/abci/client/mocks" - "github.com/cometbft/cometbft/proxy/mocks" + abcimocks "git.cw.tr/mukan-network/mukan-consensus/abci/client/mocks" + "git.cw.tr/mukan-network/mukan-consensus/proxy/mocks" ) func TestAppConns_Start_Stop(t *testing.T) { diff --git a/proxy/version.go b/proxy/version.go index 1dd0fdb..fdcc13c 100644 --- a/proxy/version.go +++ b/proxy/version.go @@ -1,8 +1,8 @@ package proxy import ( - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/version" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // RequestInfo contains all the information for sending diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index 8f32242..83b3042 100644 --- a/rpc/client/event_test.go +++ b/rpc/client/event_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var waitForEventTimeout = 8 * time.Second diff --git a/rpc/client/evidence_test.go b/rpc/client/evidence_test.go index 0a99b04..94ffd49 100644 --- a/rpc/client/evidence_test.go +++ b/rpc/client/evidence_test.go @@ -9,17 +9,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/rpc/client" - rpctest "github.com/cometbft/cometbft/rpc/test" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // For some reason the empty node used in tests has a time of diff --git a/rpc/client/examples_test.go b/rpc/client/examples_test.go index 2cf7de2..8612158 100644 --- a/rpc/client/examples_test.go +++ b/rpc/client/examples_test.go @@ -7,11 +7,11 @@ import ( "log" "strings" - "github.com/cometbft/cometbft/abci/example/kvstore" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/cometbft/cometbft/rpc/jsonrpc/types" - rpctest "github.com/cometbft/cometbft/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" ) func ExampleHTTP_simple() { diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go index b2bca31..99e5f1e 100644 --- a/rpc/client/helpers.go +++ b/rpc/client/helpers.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Waiter is informed of current height, decided whether to quit early diff --git a/rpc/client/helpers_test.go b/rpc/client/helpers_test.go index 8b698f3..3f13a58 100644 --- a/rpc/client/helpers_test.go +++ b/rpc/client/helpers_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/client/mock" - ctypes "github.com/cometbft/cometbft/rpc/core/types" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client/mock" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" ) func TestWaitForHeight(t *testing.T) { diff --git a/rpc/client/http/http.go b/rpc/client/http/http.go index 7cd746d..1401be0 100644 --- a/rpc/client/http/http.go +++ b/rpc/client/http/http.go @@ -7,16 +7,16 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - rpcclient "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - jsonrpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + jsonrpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/client" + "git.cw.tr/mukan-network/mukan-consensus/types" ) /* diff --git a/rpc/client/interface.go b/rpc/client/interface.go index 398e774..a46b5e5 100644 --- a/rpc/client/interface.go +++ b/rpc/client/interface.go @@ -23,10 +23,10 @@ implementation. import ( "context" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/service" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Client wraps most important rpc calls a client would make if you want to diff --git a/rpc/client/local/local.go b/rpc/client/local/local.go index f1289c1..cfe746c 100644 --- a/rpc/client/local/local.go +++ b/rpc/client/local/local.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - nm "github.com/cometbft/cometbft/node" - rpcclient "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/core" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + cmtquery "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + nm "git.cw.tr/mukan-network/mukan-consensus/node" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + "git.cw.tr/mukan-network/mukan-consensus/rpc/core" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) /* diff --git a/rpc/client/main_test.go b/rpc/client/main_test.go index 636d800..7f2985a 100644 --- a/rpc/client/main_test.go +++ b/rpc/client/main_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - nm "github.com/cometbft/cometbft/node" - rpctest "github.com/cometbft/cometbft/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + nm "git.cw.tr/mukan-network/mukan-consensus/node" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" ) var node *nm.Node diff --git a/rpc/client/mock/client.go b/rpc/client/mock/client.go index 1aca785..b097cce 100644 --- a/rpc/client/mock/client.go +++ b/rpc/client/mock/client.go @@ -18,13 +18,13 @@ import ( "context" "reflect" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/core" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + "git.cw.tr/mukan-network/mukan-consensus/rpc/core" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Client wraps arbitrary implementations of the various interfaces. diff --git a/rpc/client/mock/status.go b/rpc/client/mock/status.go index 95fdcc3..75c4e59 100644 --- a/rpc/client/mock/status.go +++ b/rpc/client/mock/status.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" ) // StatusMock returns the result specified by the Call diff --git a/rpc/client/mock/status_test.go b/rpc/client/mock/status_test.go index 9ee3cf6..bad6795 100644 --- a/rpc/client/mock/status_test.go +++ b/rpc/client/mock/status_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/rpc/client/mock" - ctypes "github.com/cometbft/cometbft/rpc/core/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client/mock" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" ) func TestStatus(t *testing.T) { diff --git a/rpc/client/mocks/client.go b/rpc/client/mocks/client.go index 1b99ee9..23d0965 100644 --- a/rpc/client/mocks/client.go +++ b/rpc/client/mocks/client.go @@ -3,18 +3,18 @@ package mocks import ( - bytes "github.com/cometbft/cometbft/libs/bytes" - client "github.com/cometbft/cometbft/rpc/client" + bytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + client "git.cw.tr/mukan-network/mukan-consensus/rpc/client" context "context" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + coretypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" - log "github.com/cometbft/cometbft/libs/log" + log "git.cw.tr/mukan-network/mukan-consensus/libs/log" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // Client is an autogenerated mock type for the Client type diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index 6551189..363bdbe 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -14,18 +14,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/rpc/client" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpclocal "github.com/cometbft/cometbft/rpc/client/local" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" - rpctest "github.com/cometbft/cometbft/rpc/test" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/rpc/client" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + rpclocal "git.cw.tr/mukan-network/mukan-consensus/rpc/client/local" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/client" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var ( diff --git a/rpc/core/abci.go b/rpc/core/abci.go index 315b51e..a3b0835 100644 --- a/rpc/core/abci.go +++ b/rpc/core/abci.go @@ -3,11 +3,11 @@ package core import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/proxy" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // ABCIQuery queries the application for some information. diff --git a/rpc/core/blocks.go b/rpc/core/blocks.go index bb77af6..2184d9a 100644 --- a/rpc/core/blocks.go +++ b/rpc/core/blocks.go @@ -5,13 +5,13 @@ import ( "fmt" "sort" - "github.com/cometbft/cometbft/libs/bytes" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - blockidxnull "github.com/cometbft/cometbft/state/indexer/block/null" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtquery "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + blockidxnull "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block/null" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // BlockchainInfo gets block headers for minHeight <= height <= maxHeight. diff --git a/rpc/core/blocks_test.go b/rpc/core/blocks_test.go index 054a8bb..1a42f89 100644 --- a/rpc/core/blocks_test.go +++ b/rpc/core/blocks_test.go @@ -7,13 +7,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/mocks" ) func TestBlockchainInfo(t *testing.T) { diff --git a/rpc/core/consensus.go b/rpc/core/consensus.go index 5c16422..945e866 100644 --- a/rpc/core/consensus.go +++ b/rpc/core/consensus.go @@ -1,11 +1,11 @@ package core import ( - cm "github.com/cometbft/cometbft/consensus" - cmtmath "github.com/cometbft/cometbft/libs/math" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + cm "git.cw.tr/mukan-network/mukan-consensus/consensus" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Validators gets the validator set at the given block height. diff --git a/rpc/core/dev.go b/rpc/core/dev.go index 55dfe42..7517ff6 100644 --- a/rpc/core/dev.go +++ b/rpc/core/dev.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // UnsafeFlushMempool removes all transactions from the mempool. diff --git a/rpc/core/doc.go b/rpc/core/doc.go index 2c177c8..4dad37e 100644 --- a/rpc/core/doc.go +++ b/rpc/core/doc.go @@ -2,7 +2,7 @@ Package core defines the CometBFT RPC endpoints. CometBFT ships with its own JSONRPC library - -https://github.com/cometbft/cometbft/tree/v0.38.x/rpc/jsonrpc. +https://git.cw.tr/mukan-network/mukan-consensus/tree/v0.38.x/rpc/jsonrpc. ## Get the list diff --git a/rpc/core/env.go b/rpc/core/env.go index 9f17495..8cd6961 100644 --- a/rpc/core/env.go +++ b/rpc/core/env.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/rpc/core/events.go b/rpc/core/events.go index 99bba61..2c988fb 100644 --- a/rpc/core/events.go +++ b/rpc/core/events.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + cmtquery "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) const ( diff --git a/rpc/core/evidence.go b/rpc/core/evidence.go index b7aa20c..dc322b6 100644 --- a/rpc/core/evidence.go +++ b/rpc/core/evidence.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // BroadcastEvidence broadcasts evidence of the misbehavior. diff --git a/rpc/core/health.go b/rpc/core/health.go index c347d06..60eb8ab 100644 --- a/rpc/core/health.go +++ b/rpc/core/health.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // Health gets node health. Returns empty result (200 OK) on success, no diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go index 3112dbe..c19cf64 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - mempl "github.com/cometbft/cometbft/mempool" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/net.go b/rpc/core/net.go index 77c6a56..90432c9 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/p2p" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // NetInfo returns network info. diff --git a/rpc/core/net_test.go b/rpc/core/net_test.go index 66f93ee..3b40c54 100644 --- a/rpc/core/net_test.go +++ b/rpc/core/net_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) func TestUnsafeDialSeeds(t *testing.T) { diff --git a/rpc/core/routes.go b/rpc/core/routes.go index 7aa57bc..00fd582 100644 --- a/rpc/core/routes.go +++ b/rpc/core/routes.go @@ -1,7 +1,7 @@ package core import ( - rpc "github.com/cometbft/cometbft/rpc/jsonrpc/server" + rpc "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" ) // TODO: better system than "unsafe" prefix diff --git a/rpc/core/status.go b/rpc/core/status.go index e4737f5..1b72515 100644 --- a/rpc/core/status.go +++ b/rpc/core/status.go @@ -3,11 +3,11 @@ package core import ( "time" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/p2p" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Status returns CometBFT status including node info, pubkey, latest block diff --git a/rpc/core/tx.go b/rpc/core/tx.go index 5abd0dd..9159c5e 100644 --- a/rpc/core/tx.go +++ b/rpc/core/tx.go @@ -5,12 +5,12 @@ import ( "fmt" "sort" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/state/txindex/null" - "github.com/cometbft/cometbft/types" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtquery "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex/null" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Tx allows you to query the transaction results. `nil` could mean the diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index 19c3c2d..c82b31c 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // List of blocks diff --git a/rpc/core/types/responses_test.go b/rpc/core/types/responses_test.go index d247e51..52c52f8 100644 --- a/rpc/core/types/responses_test.go +++ b/rpc/core/types/responses_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) func TestStatusIndexer(t *testing.T) { diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go index ed5545e..d67c328 100644 --- a/rpc/grpc/api.go +++ b/rpc/grpc/api.go @@ -3,9 +3,9 @@ package coregrpc import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - core "github.com/cometbft/cometbft/rpc/core" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + core "git.cw.tr/mukan-network/mukan-consensus/rpc/core" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) type broadcastAPI struct { diff --git a/rpc/grpc/client_server.go b/rpc/grpc/client_server.go index 89cdf92..ad9c5b9 100644 --- a/rpc/grpc/client_server.go +++ b/rpc/grpc/client_server.go @@ -6,8 +6,8 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/rpc/core" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/rpc/core" ) // Config is an gRPC server configuration. diff --git a/rpc/grpc/grpc_test.go b/rpc/grpc/grpc_test.go index b354158..73fadfb 100644 --- a/rpc/grpc/grpc_test.go +++ b/rpc/grpc/grpc_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - core_grpc "github.com/cometbft/cometbft/rpc/grpc" - rpctest "github.com/cometbft/cometbft/rpc/test" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + core_grpc "git.cw.tr/mukan-network/mukan-consensus/rpc/grpc" + rpctest "git.cw.tr/mukan-network/mukan-consensus/rpc/test" ) func TestMain(m *testing.M) { diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index ee2010a..80c6af4 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -6,7 +6,7 @@ package coregrpc import ( context "context" fmt "fmt" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" grpc "google.golang.org/grpc" diff --git a/rpc/jsonrpc/client/decode.go b/rpc/jsonrpc/client/decode.go index f38df3f..26243d8 100644 --- a/rpc/jsonrpc/client/decode.go +++ b/rpc/jsonrpc/client/decode.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - cmtjson "github.com/cometbft/cometbft/libs/json" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) func unmarshalResponseBytes( diff --git a/rpc/jsonrpc/client/encode.go b/rpc/jsonrpc/client/encode.go index e313842..e9a3740 100644 --- a/rpc/jsonrpc/client/encode.go +++ b/rpc/jsonrpc/client/encode.go @@ -5,7 +5,7 @@ import ( "net/url" "reflect" - cmtjson "github.com/cometbft/cometbft/libs/json" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) func argsToURLValues(args map[string]interface{}) (url.Values, error) { diff --git a/rpc/jsonrpc/client/http_json_client.go b/rpc/jsonrpc/client/http_json_client.go index a40663b..5ff3d8c 100644 --- a/rpc/jsonrpc/client/http_json_client.go +++ b/rpc/jsonrpc/client/http_json_client.go @@ -12,8 +12,8 @@ import ( "regexp" "strings" - cmtsync "github.com/cometbft/cometbft/libs/sync" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/http_uri_client.go b/rpc/jsonrpc/client/http_uri_client.go index 89bdcf3..4c1aeba 100644 --- a/rpc/jsonrpc/client/http_uri_client.go +++ b/rpc/jsonrpc/client/http_uri_client.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/integration_test.go b/rpc/jsonrpc/client/integration_test.go index 9e996f7..fb91567 100644 --- a/rpc/jsonrpc/client/integration_test.go +++ b/rpc/jsonrpc/client/integration_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) func TestWSClientReconnectWithJitter(t *testing.T) { diff --git a/rpc/jsonrpc/client/ws_client.go b/rpc/jsonrpc/client/ws_client.go index 9692db1..7b657b3 100644 --- a/rpc/jsonrpc/client/ws_client.go +++ b/rpc/jsonrpc/client/ws_client.go @@ -13,11 +13,11 @@ import ( "github.com/gorilla/websocket" metrics "github.com/rcrowley/go-metrics" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/ws_client_test.go b/rpc/jsonrpc/client/ws_client_test.go index c2e996d..a768032 100644 --- a/rpc/jsonrpc/client/ws_client_test.go +++ b/rpc/jsonrpc/client/ws_client_test.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) var wsCallTimeout = 5 * time.Second diff --git a/rpc/jsonrpc/doc.go b/rpc/jsonrpc/doc.go index 1d6c80c..8e5a364 100644 --- a/rpc/jsonrpc/doc.go +++ b/rpc/jsonrpc/doc.go @@ -80,5 +80,5 @@ // // # Examples // -// - [CometBFT](https://github.com/cometbft/cometbft/blob/v0.38.x/rpc/core/routes.go) +// - [CometBFT](https://git.cw.tr/mukan-network/mukan-consensus/blob/v0.38.x/rpc/core/routes.go) package jsonrpc diff --git a/rpc/jsonrpc/jsonrpc_test.go b/rpc/jsonrpc/jsonrpc_test.go index b4a444f..b24a4d1 100644 --- a/rpc/jsonrpc/jsonrpc_test.go +++ b/rpc/jsonrpc/jsonrpc_test.go @@ -18,13 +18,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" - client "github.com/cometbft/cometbft/rpc/jsonrpc/client" - server "github.com/cometbft/cometbft/rpc/jsonrpc/server" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + client "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/client" + server "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // Client and Server should work over tcp or unix sockets diff --git a/rpc/jsonrpc/server/http_json_handler.go b/rpc/jsonrpc/server/http_json_handler.go index da2bfc8..c9475ad 100644 --- a/rpc/jsonrpc/server/http_json_handler.go +++ b/rpc/jsonrpc/server/http_json_handler.go @@ -9,9 +9,9 @@ import ( "reflect" "sort" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // HTTP + JSON handler diff --git a/rpc/jsonrpc/server/http_json_handler_test.go b/rpc/jsonrpc/server/http_json_handler_test.go index 7de2e82..6614117 100644 --- a/rpc/jsonrpc/server/http_json_handler_test.go +++ b/rpc/jsonrpc/server/http_json_handler_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) func testMux() *http.ServeMux { diff --git a/rpc/jsonrpc/server/http_server.go b/rpc/jsonrpc/server/http_server.go index 9c6f444..756c9dd 100644 --- a/rpc/jsonrpc/server/http_server.go +++ b/rpc/jsonrpc/server/http_server.go @@ -17,8 +17,8 @@ import ( "golang.org/x/net/netutil" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // Config is a RPC server configuration. diff --git a/rpc/jsonrpc/server/http_server_test.go b/rpc/jsonrpc/server/http_server_test.go index ddd2bfa..a8d0373 100644 --- a/rpc/jsonrpc/server/http_server_test.go +++ b/rpc/jsonrpc/server/http_server_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) type sampleResult struct { diff --git a/rpc/jsonrpc/server/http_uri_handler.go b/rpc/jsonrpc/server/http_uri_handler.go index c4f996e..17cdab4 100644 --- a/rpc/jsonrpc/server/http_uri_handler.go +++ b/rpc/jsonrpc/server/http_uri_handler.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // HTTP + URI handler diff --git a/rpc/jsonrpc/server/parse_test.go b/rpc/jsonrpc/server/parse_test.go index c4eb497..ff0c76c 100644 --- a/rpc/jsonrpc/server/parse_test.go +++ b/rpc/jsonrpc/server/parse_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/libs/bytes" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) func TestParseJSONMap(t *testing.T) { diff --git a/rpc/jsonrpc/server/rpc_func.go b/rpc/jsonrpc/server/rpc_func.go index a0a2f9a..459df5c 100644 --- a/rpc/jsonrpc/server/rpc_func.go +++ b/rpc/jsonrpc/server/rpc_func.go @@ -6,7 +6,7 @@ import ( "reflect" "strings" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) // RegisterRPCFuncs adds a route for each function in the funcMap, as well as diff --git a/rpc/jsonrpc/server/ws_handler.go b/rpc/jsonrpc/server/ws_handler.go index e899092..d248695 100644 --- a/rpc/jsonrpc/server/ws_handler.go +++ b/rpc/jsonrpc/server/ws_handler.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) // WebSocket handler diff --git a/rpc/jsonrpc/server/ws_handler_test.go b/rpc/jsonrpc/server/ws_handler_test.go index 69ede2d..0383b27 100644 --- a/rpc/jsonrpc/server/ws_handler_test.go +++ b/rpc/jsonrpc/server/ws_handler_test.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + types "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) func TestWebsocketManagerHandler(t *testing.T) { diff --git a/rpc/jsonrpc/test/main.go b/rpc/jsonrpc/test/main.go index 72d9e7c..a908153 100644 --- a/rpc/jsonrpc/test/main.go +++ b/rpc/jsonrpc/test/main.go @@ -5,10 +5,10 @@ import ( "net/http" "os" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) var routes = map[string]*rpcserver.RPCFunc{ diff --git a/rpc/jsonrpc/types/types.go b/rpc/jsonrpc/types/types.go index 9aadb5e..51a8c78 100644 --- a/rpc/jsonrpc/types/types.go +++ b/rpc/jsonrpc/types/types.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - cmtjson "github.com/cometbft/cometbft/libs/json" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) // a wrapper to emulate a sum type: jsonrpcid = string | int diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go index ee25513..12cf158 100644 --- a/rpc/test/helpers.go +++ b/rpc/test/helpers.go @@ -8,19 +8,19 @@ import ( "strings" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" - cfg "github.com/cometbft/cometbft/config" - cmtnet "github.com/cometbft/cometbft/libs/net" - nm "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - core_grpc "github.com/cometbft/cometbft/rpc/grpc" - rpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" + cfg "git.cw.tr/mukan-network/mukan-consensus/config" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + nm "git.cw.tr/mukan-network/mukan-consensus/node" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + ctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + core_grpc "git.cw.tr/mukan-network/mukan-consensus/rpc/grpc" + rpcclient "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/client" ) // Options helps with specifying some parameters for our RPC testing for greater diff --git a/scripts/json2wal/main.go b/scripts/json2wal/main.go index 014a95e..90cdde9 100644 --- a/scripts/json2wal/main.go +++ b/scripts/json2wal/main.go @@ -14,9 +14,9 @@ import ( "os" "strings" - cs "github.com/cometbft/cometbft/consensus" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/types" + cs "git.cw.tr/mukan-network/mukan-consensus/consensus" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func main() { diff --git a/scripts/metricsgen/metricsdiff/metricsdiff_test.go b/scripts/metricsgen/metricsdiff/metricsdiff_test.go index 54bc595..4225092 100644 --- a/scripts/metricsgen/metricsdiff/metricsdiff_test.go +++ b/scripts/metricsgen/metricsdiff/metricsdiff_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - metricsdiff "github.com/cometbft/cometbft/scripts/metricsgen/metricsdiff" + metricsdiff "git.cw.tr/mukan-network/mukan-consensus/scripts/metricsgen/metricsdiff" ) func TestDiff(t *testing.T) { diff --git a/scripts/metricsgen/metricsgen_test.go b/scripts/metricsgen/metricsgen_test.go index 41307f2..0ef0596 100644 --- a/scripts/metricsgen/metricsgen_test.go +++ b/scripts/metricsgen/metricsgen_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" - metricsgen "github.com/cometbft/cometbft/scripts/metricsgen" + metricsgen "git.cw.tr/mukan-network/mukan-consensus/scripts/metricsgen" ) const testDataDir = "./testdata" diff --git a/scripts/wal2json/main.go b/scripts/wal2json/main.go index 74b8601..2bea5fd 100644 --- a/scripts/wal2json/main.go +++ b/scripts/wal2json/main.go @@ -12,8 +12,8 @@ import ( "io" "os" - cs "github.com/cometbft/cometbft/consensus" - cmtjson "github.com/cometbft/cometbft/libs/json" + cs "git.cw.tr/mukan-network/mukan-consensus/consensus" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" ) func main() { diff --git a/state/compatibility_test.go b/state/compatibility_test.go index c5d6ace..ed9876c 100644 --- a/state/compatibility_test.go +++ b/state/compatibility_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" + cmtcrypto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" - abci "github.com/cometbft/cometbft/abci/types" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" "github.com/stretchr/testify/require" ) diff --git a/state/execution.go b/state/execution.go index ff72340..d0034ed 100644 --- a/state/execution.go +++ b/state/execution.go @@ -6,14 +6,14 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/fail" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/mempool" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/libs/fail" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/mempool" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //----------------------------------------------------------------------------- diff --git a/state/execution_test.go b/state/execution_test.go index c48d109..fcac563 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -10,28 +10,28 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abciclientmocks "github.com/cometbft/cometbft/abci/client/mocks" - abci "github.com/cometbft/cometbft/abci/types" - abcimocks "github.com/cometbft/cometbft/abci/types/mocks" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - mpmocks "github.com/cometbft/cometbft/mempool/mocks" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/proxy" - pmocks "github.com/cometbft/cometbft/proxy/mocks" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + abciclientmocks "git.cw.tr/mukan-network/mukan-consensus/abci/client/mocks" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + abcimocks "git.cw.tr/mukan-network/mukan-consensus/abci/types/mocks" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + mpmocks "git.cw.tr/mukan-network/mukan-consensus/mempool/mocks" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + pmocks "git.cw.tr/mukan-network/mukan-consensus/proxy/mocks" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" + "git.cw.tr/mukan-network/mukan-consensus/version" ) var ( diff --git a/state/export_test.go b/state/export_test.go index e554910..6ad35d9 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -1,10 +1,10 @@ package state import ( - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // diff --git a/state/helpers_test.go b/state/helpers_test.go index b09bcae..2be2408 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -6,17 +6,17 @@ import ( "fmt" "time" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/internal/test" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) type paramsChangeTestCase struct { diff --git a/state/indexer/block.go b/state/indexer/block.go index b00b4be..5e3b150 100644 --- a/state/indexer/block.go +++ b/state/indexer/block.go @@ -3,9 +3,9 @@ package indexer import ( "context" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //go:generate ../../scripts/mockery_generate.sh BlockIndexer diff --git a/state/indexer/block/indexer.go b/state/indexer/block/indexer.go index 210bd67..bc22cbd 100644 --- a/state/indexer/block/indexer.go +++ b/state/indexer/block/indexer.go @@ -4,16 +4,16 @@ import ( "errors" "fmt" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/state/indexer" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - blockidxnull "github.com/cometbft/cometbft/state/indexer/block/null" - "github.com/cometbft/cometbft/state/indexer/sink/psql" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/kv" - "github.com/cometbft/cometbft/state/txindex/null" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + blockidxkv "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block/kv" + blockidxnull "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block/null" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer/sink/psql" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex/kv" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex/null" ) // IndexerFromConfig constructs a slice of indexer.EventSink using the provided diff --git a/state/indexer/block/kv/kv.go b/state/indexer/block/kv/kv.go index ed8b706..b2d084b 100644 --- a/state/indexer/block/kv/kv.go +++ b/state/indexer/block/kv/kv.go @@ -12,15 +12,15 @@ import ( "github.com/google/orderedcode" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - idxutil "github.com/cometbft/cometbft/internal/indexer" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + idxutil "git.cw.tr/mukan-network/mukan-consensus/internal/indexer" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var _ indexer.BlockIndexer = (*BlockerIndexer)(nil) diff --git a/state/indexer/block/kv/kv_test.go b/state/indexer/block/kv/kv_test.go index 18ce0c9..cb90e04 100644 --- a/state/indexer/block/kv/kv_test.go +++ b/state/indexer/block/kv/kv_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/require" - db "github.com/cometbft/cometbft-db" + db "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + blockidxkv "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block/kv" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestBlockIndexer(t *testing.T) { diff --git a/state/indexer/block/kv/util.go b/state/indexer/block/kv/util.go index d4a353c..246c89c 100644 --- a/state/indexer/block/kv/util.go +++ b/state/indexer/block/kv/util.go @@ -8,10 +8,10 @@ import ( "github.com/google/orderedcode" - idxutil "github.com/cometbft/cometbft/internal/indexer" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + idxutil "git.cw.tr/mukan-network/mukan-consensus/internal/indexer" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type HeightInfo struct { diff --git a/state/indexer/block/null/null.go b/state/indexer/block/null/null.go index 7c50531..fd9522a 100644 --- a/state/indexer/block/null/null.go +++ b/state/indexer/block/null/null.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/types" ) var _ indexer.BlockIndexer = (*BlockerIndexer)(nil) diff --git a/state/indexer/mocks/block_indexer.go b/state/indexer/mocks/block_indexer.go index 21a2261..d80c557 100644 --- a/state/indexer/mocks/block_indexer.go +++ b/state/indexer/mocks/block_indexer.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - log "github.com/cometbft/cometbft/libs/log" + log "git.cw.tr/mukan-network/mukan-consensus/libs/log" mock "github.com/stretchr/testify/mock" - query "github.com/cometbft/cometbft/libs/pubsub/query" + query "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // BlockIndexer is an autogenerated mock type for the BlockIndexer type diff --git a/state/indexer/query_range.go b/state/indexer/query_range.go index 80bd0e6..c1102fc 100644 --- a/state/indexer/query_range.go +++ b/state/indexer/query_range.go @@ -4,8 +4,8 @@ import ( "math/big" "time" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // QueryRanges defines a mapping between a composite event key and a QueryRange. diff --git a/state/indexer/sink/psql/backport.go b/state/indexer/sink/psql/backport.go index 3ff4399..13b4306 100644 --- a/state/indexer/sink/psql/backport.go +++ b/state/indexer/sink/psql/backport.go @@ -17,12 +17,12 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/state/indexer/sink/psql/backport_test.go b/state/indexer/sink/psql/backport_test.go index e977896..577c6a7 100644 --- a/state/indexer/sink/psql/backport_test.go +++ b/state/indexer/sink/psql/backport_test.go @@ -1,8 +1,8 @@ package psql import ( - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" ) var ( diff --git a/state/indexer/sink/psql/psql.go b/state/indexer/sink/psql/psql.go index e379f44..47480fb 100644 --- a/state/indexer/sink/psql/psql.go +++ b/state/indexer/sink/psql/psql.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/gogoproto/proto" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/state/indexer/sink/psql/psql_test.go b/state/indexer/sink/psql/psql_test.go index e545324..2acdcac 100644 --- a/state/indexer/sink/psql/psql_test.go +++ b/state/indexer/sink/psql/psql_test.go @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - tmlog "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + tmlog "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/types" // Register the Postgres database driver. _ "github.com/lib/pq" diff --git a/state/mocks/block_store.go b/state/mocks/block_store.go index f66ecfc..c395b50 100644 --- a/state/mocks/block_store.go +++ b/state/mocks/block_store.go @@ -3,10 +3,10 @@ package mocks import ( - state "github.com/cometbft/cometbft/state" + state "git.cw.tr/mukan-network/mukan-consensus/state" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // BlockStore is an autogenerated mock type for the BlockStore type diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index 94606c6..90f93a3 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -3,10 +3,10 @@ package mocks import ( - state "github.com/cometbft/cometbft/state" + state "git.cw.tr/mukan-network/mukan-consensus/state" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // EvidencePool is an autogenerated mock type for the EvidencePool type diff --git a/state/mocks/store.go b/state/mocks/store.go index 92584e8..1fc7a4c 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -3,12 +3,12 @@ package mocks import ( - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "git.cw.tr/mukan-network/mukan-consensus/abci/types" mock "github.com/stretchr/testify/mock" - state "github.com/cometbft/cometbft/state" + state "git.cw.tr/mukan-network/mukan-consensus/state" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // Store is an autogenerated mock type for the Store type diff --git a/state/rollback.go b/state/rollback.go index b243763..25768df 100644 --- a/state/rollback.go +++ b/state/rollback.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // Rollback overwrites the current CometBFT state (height n) with the most diff --git a/state/rollback_test.go b/state/rollback_test.go index d56fe67..b9d091f 100644 --- a/state/rollback_test.go +++ b/state/rollback_test.go @@ -7,17 +7,17 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) func TestRollback(t *testing.T) { diff --git a/state/services.go b/state/services.go index 4389a08..8ecbc4a 100644 --- a/state/services.go +++ b/state/services.go @@ -1,7 +1,7 @@ package state import ( - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //------------------------------------------------------ diff --git a/state/state.go b/state/state.go index 2bd5023..42e1d8d 100644 --- a/state/state.go +++ b/state/state.go @@ -9,11 +9,11 @@ import ( "github.com/cosmos/gogoproto/proto" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // database keys diff --git a/state/state_test.go b/state/state_test.go index b128a91..bf6732f 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -12,15 +12,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // setupTestCase does setup common to all test cases. diff --git a/state/store.go b/state/store.go index 6463dc3..da3642c 100644 --- a/state/store.go +++ b/state/store.go @@ -7,14 +7,14 @@ import ( "github.com/cosmos/gogoproto/proto" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( @@ -83,7 +83,7 @@ type Store interface { Close() error } -// dbStore wraps a db (github.com/cometbft/cometbft-db) +// dbStore wraps a db (git.cw.tr/mukan-network/mukan-consensus-db) type dbStore struct { db dbm.DB diff --git a/state/store_test.go b/state/store_test.go index dbb8551..99be025 100644 --- a/state/store_test.go +++ b/state/store_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/internal/test" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestStoreLoadValidators(t *testing.T) { diff --git a/state/tx_filter.go b/state/tx_filter.go index 9527cb8..1818310 100644 --- a/state/tx_filter.go +++ b/state/tx_filter.go @@ -1,8 +1,8 @@ package state import ( - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/types" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // TxPreCheck returns a function to filter transactions before processing. diff --git a/state/tx_filter_test.go b/state/tx_filter_test.go index 367fe52..9de2769 100644 --- a/state/tx_filter_test.go +++ b/state/tx_filter_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - cmtrand "github.com/cometbft/cometbft/libs/rand" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestTxFilter(t *testing.T) { diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go index fcf37d4..56274f0 100644 --- a/state/txindex/indexer.go +++ b/state/txindex/indexer.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" ) // XXX/TODO: These types should be moved to the indexer package. diff --git a/state/txindex/indexer_service.go b/state/txindex/indexer_service.go index d927913..c2be6bf 100644 --- a/state/txindex/indexer_service.go +++ b/state/txindex/indexer_service.go @@ -3,9 +3,9 @@ package txindex import ( "context" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // XXX/TODO: These types should be moved to the indexer package. diff --git a/state/txindex/indexer_service_test.go b/state/txindex/indexer_service_test.go index 6727c96..fc0daf9 100644 --- a/state/txindex/indexer_service_test.go +++ b/state/txindex/indexer_service_test.go @@ -6,14 +6,14 @@ import ( "github.com/stretchr/testify/require" - db "github.com/cometbft/cometbft-db" + db "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/kv" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + blockidxkv "git.cw.tr/mukan-network/mukan-consensus/state/indexer/block/kv" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex/kv" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestIndexerServiceIndexesBlocks(t *testing.T) { diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go index fb6b6e3..c81dc00 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -10,19 +10,19 @@ import ( "strconv" "strings" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" "github.com/cosmos/gogoproto/proto" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - idxutil "github.com/cometbft/cometbft/internal/indexer" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + idxutil "git.cw.tr/mukan-network/mukan-consensus/internal/indexer" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/state/txindex/kv/kv_bench_test.go b/state/txindex/kv/kv_bench_test.go index 92baa11..476c961 100644 --- a/state/txindex/kv/kv_bench_test.go +++ b/state/txindex/kv/kv_bench_test.go @@ -7,11 +7,11 @@ import ( "os" "testing" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func BenchmarkTxSearch(b *testing.B) { diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index 3595d9a..562819a 100644 --- a/state/txindex/kv/kv_test.go +++ b/state/txindex/kv/kv_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - db "github.com/cometbft/cometbft-db" + db "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func TestTxIndex(t *testing.T) { diff --git a/state/txindex/kv/utils.go b/state/txindex/kv/utils.go index f96c2d7..f70ae92 100644 --- a/state/txindex/kv/utils.go +++ b/state/txindex/kv/utils.go @@ -4,10 +4,10 @@ import ( "fmt" "math/big" - idxutil "github.com/cometbft/cometbft/internal/indexer" - cmtsyntax "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + idxutil "git.cw.tr/mukan-network/mukan-consensus/internal/indexer" + cmtsyntax "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query/syntax" + "git.cw.tr/mukan-network/mukan-consensus/state/indexer" + "git.cw.tr/mukan-network/mukan-consensus/types" "github.com/google/orderedcode" ) diff --git a/state/txindex/mocks/tx_indexer.go b/state/txindex/mocks/tx_indexer.go index 6627e4d..93d26e1 100644 --- a/state/txindex/mocks/tx_indexer.go +++ b/state/txindex/mocks/tx_indexer.go @@ -5,14 +5,14 @@ package mocks import ( context "context" - log "github.com/cometbft/cometbft/libs/log" + log "git.cw.tr/mukan-network/mukan-consensus/libs/log" mock "github.com/stretchr/testify/mock" - query "github.com/cometbft/cometbft/libs/pubsub/query" + query "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" - txindex "github.com/cometbft/cometbft/state/txindex" + txindex "git.cw.tr/mukan-network/mukan-consensus/state/txindex" - types "github.com/cometbft/cometbft/abci/types" + types "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) // TxIndexer is an autogenerated mock type for the TxIndexer type diff --git a/state/txindex/null/null.go b/state/txindex/null/null.go index 4bee6fc..95b44a0 100644 --- a/state/txindex/null/null.go +++ b/state/txindex/null/null.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/state/txindex" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" + "git.cw.tr/mukan-network/mukan-consensus/state/txindex" ) var _ txindex.TxIndexer = (*TxIndex)(nil) diff --git a/state/validation.go b/state/validation.go index 0bfe62a..7c8a67d 100644 --- a/state/validation.go +++ b/state/validation.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/types" ) //----------------------------------------------------- diff --git a/state/validation_test.go b/state/validation_test.go index 7f04a56..9e80f60 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -8,20 +8,20 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - mpmocks "github.com/cometbft/cometbft/mempool/mocks" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + mpmocks "git.cw.tr/mukan-network/mukan-consensus/mempool/mocks" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/state/mocks" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) const validationTestsStopHeight int64 = 10 diff --git a/statesync/chunks.go b/statesync/chunks.go index 054467f..7896dec 100644 --- a/statesync/chunks.go +++ b/statesync/chunks.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // errDone is returned by chunkQueue.Next() when all chunks have been returned. diff --git a/statesync/chunks_test.go b/statesync/chunks_test.go index 1b9382d..da6e9cc 100644 --- a/statesync/chunks_test.go +++ b/statesync/chunks_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/p2p" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) func setupChunkQueue(t *testing.T) (*chunkQueue, func()) { diff --git a/statesync/messages.go b/statesync/messages.go index 94c0f68..00a4106 100644 --- a/statesync/messages.go +++ b/statesync/messages.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/gogoproto/proto" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" + ssproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/statesync" ) const ( diff --git a/statesync/messages_test.go b/statesync/messages_test.go index a1ea7a2..e8d09ed 100644 --- a/statesync/messages_test.go +++ b/statesync/messages_test.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/p2p" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + ssproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/statesync" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) func TestValidateMsg(t *testing.T) { diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index 1f648a5..54a0a1a 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - state "github.com/cometbft/cometbft/state" + state "git.cw.tr/mukan-network/mukan-consensus/state" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "git.cw.tr/mukan-network/mukan-consensus/types" ) // StateProvider is an autogenerated mock type for the StateProvider type diff --git a/statesync/reactor.go b/statesync/reactor.go index a2ec0e1..3ed1ca8 100644 --- a/statesync/reactor.go +++ b/statesync/reactor.go @@ -6,14 +6,14 @@ import ( "sort" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + ssproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/statesync" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/statesync/reactor_test.go b/statesync/reactor_test.go index af24d75..ef650cc 100644 --- a/statesync/reactor_test.go +++ b/statesync/reactor_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - proxymocks "github.com/cometbft/cometbft/proxy/mocks" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + p2pmocks "git.cw.tr/mukan-network/mukan-consensus/p2p/mocks" + ssproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/statesync" + proxymocks "git.cw.tr/mukan-network/mukan-consensus/proxy/mocks" ) func TestReactor_Receive_ChunkRequest(t *testing.T) { diff --git a/statesync/snapshots.go b/statesync/snapshots.go index f0e3c79..1fb9bf2 100644 --- a/statesync/snapshots.go +++ b/statesync/snapshots.go @@ -6,8 +6,8 @@ import ( "math/rand" "sort" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" ) // snapshotKey is a snapshot key used for lookups. diff --git a/statesync/snapshots_test.go b/statesync/snapshots_test.go index 36665ae..6d769d5 100644 --- a/statesync/snapshots_test.go +++ b/statesync/snapshots_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + p2pmocks "git.cw.tr/mukan-network/mukan-consensus/p2p/mocks" ) func TestSnapshot_Key(t *testing.T) { diff --git a/statesync/stateprovider.go b/statesync/stateprovider.go index 924dd29..a6a8630 100644 --- a/statesync/stateprovider.go +++ b/statesync/stateprovider.go @@ -6,20 +6,20 @@ import ( "strings" "time" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light" - lightprovider "github.com/cometbft/cometbft/light/provider" - lighthttp "github.com/cometbft/cometbft/light/provider/http" - lightrpc "github.com/cometbft/cometbft/light/rpc" - lightdb "github.com/cometbft/cometbft/light/store/db" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/light" + lightprovider "git.cw.tr/mukan-network/mukan-consensus/light/provider" + lighthttp "git.cw.tr/mukan-network/mukan-consensus/light/provider/http" + lightrpc "git.cw.tr/mukan-network/mukan-consensus/light/rpc" + lightdb "git.cw.tr/mukan-network/mukan-consensus/light/store/db" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) //go:generate ../scripts/mockery_generate.sh StateProvider diff --git a/statesync/syncer.go b/statesync/syncer.go index dc471a7..e1c48f7 100644 --- a/statesync/syncer.go +++ b/statesync/syncer.go @@ -7,16 +7,16 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/p2p" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/light" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + ssproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/statesync" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/statesync/syncer_test.go b/statesync/syncer_test.go index 4238038..e40e931 100644 --- a/statesync/syncer_test.go +++ b/statesync/syncer_test.go @@ -9,21 +9,21 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/proxy" - proxymocks "github.com/cometbft/cometbft/proxy/mocks" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/statesync/mocks" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + p2pmocks "git.cw.tr/mukan-network/mukan-consensus/p2p/mocks" + cmtstate "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/state" + ssproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/statesync" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + proxymocks "git.cw.tr/mukan-network/mukan-consensus/proxy/mocks" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/statesync/mocks" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const testAppVersion = 9 diff --git a/store/bench_test.go b/store/bench_test.go index 60b5713..16857ec 100644 --- a/store/bench_test.go +++ b/store/bench_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) // TestLoadBlockExtendedCommit tests loading the extended commit for a previously diff --git a/store/store.go b/store/store.go index 7e0e211..823f9c8 100644 --- a/store/store.go +++ b/store/store.go @@ -8,14 +8,14 @@ import ( "github.com/cosmos/gogoproto/proto" lru "github.com/hashicorp/golang-lru/v2" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/evidence" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtstore "github.com/cometbft/cometbft/proto/tendermint/store" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/evidence" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + cmtstore "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/store" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Assuming the length of a block part is 64kB (`types.BlockPartSizeBytes`), diff --git a/store/store_test.go b/store/store_test.go index 854d873..bf999cc 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -13,17 +13,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtstore "github.com/cometbft/cometbft/proto/tendermint/store" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtstore "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/store" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + sm "git.cw.tr/mukan-network/mukan-consensus/state" + "git.cw.tr/mukan-network/mukan-consensus/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // A cleanupFunc cleans up any config / test files created for a particular diff --git a/test/app/grpc_client.go b/test/app/grpc_client.go index 48636bb..fe4c1ae 100644 --- a/test/app/grpc_client.go +++ b/test/app/grpc_client.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - cmtjson "github.com/cometbft/cometbft/libs/json" - coregrpc "github.com/cometbft/cometbft/rpc/grpc" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + coregrpc "git.cw.tr/mukan-network/mukan-consensus/rpc/grpc" ) var grpcAddr = "tcp://localhost:36656" diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 683cdee..c2ad023 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttypes "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cryptoproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/crypto" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmttypes "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const ( diff --git a/test/e2e/app/snapshots.go b/test/e2e/app/snapshots.go index ac93e4d..626e5e1 100644 --- a/test/e2e/app/snapshots.go +++ b/test/e2e/app/snapshots.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sync" - abci "github.com/cometbft/cometbft/abci/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) const ( diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go index 9784c6c..470424f 100644 --- a/test/e2e/generator/generate.go +++ b/test/e2e/generator/generate.go @@ -10,8 +10,8 @@ import ( "time" "github.com/Masterminds/semver/v3" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/version" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/version" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/test/e2e/generator/generate_test.go b/test/e2e/generator/generate_test.go index 2d6b11d..51677ab 100644 --- a/test/e2e/generator/generate_test.go +++ b/test/e2e/generator/generate_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" ) // TestGenerator tests that only valid manifests are generated diff --git a/test/e2e/generator/main.go b/test/e2e/generator/main.go index 40082cf..4bc7025 100644 --- a/test/e2e/generator/main.go +++ b/test/e2e/generator/main.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" ) const ( diff --git a/test/e2e/node/config.go b/test/e2e/node/config.go index b91120c..8d2ea6e 100644 --- a/test/e2e/node/config.go +++ b/test/e2e/node/config.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" - "github.com/cometbft/cometbft/test/e2e/app" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/app" ) // Config is the application configuration. diff --git a/test/e2e/node/main.go b/test/e2e/node/main.go index 4ce3822..b7f3014 100644 --- a/test/e2e/node/main.go +++ b/test/e2e/node/main.go @@ -12,23 +12,23 @@ import ( "github.com/spf13/viper" - "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/light" - lproxy "github.com/cometbft/cometbft/light/proxy" - lrpc "github.com/cometbft/cometbft/light/rpc" - dbs "github.com/cometbft/cometbft/light/store/db" - "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - "github.com/cometbft/cometbft/test/e2e/app" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/abci/server" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtflags "git.cw.tr/mukan-network/mukan-consensus/libs/cli/flags" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtnet "git.cw.tr/mukan-network/mukan-consensus/libs/net" + "git.cw.tr/mukan-network/mukan-consensus/light" + lproxy "git.cw.tr/mukan-network/mukan-consensus/light/proxy" + lrpc "git.cw.tr/mukan-network/mukan-consensus/light/rpc" + dbs "git.cw.tr/mukan-network/mukan-consensus/light/store/db" + "git.cw.tr/mukan-network/mukan-consensus/node" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/privval" + "git.cw.tr/mukan-network/mukan-consensus/proxy" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/app" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" ) var logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout)) diff --git a/test/e2e/pkg/infra/digitalocean/digitalocean.go b/test/e2e/pkg/infra/digitalocean/digitalocean.go index ad357ad..cc79ae8 100644 --- a/test/e2e/pkg/infra/digitalocean/digitalocean.go +++ b/test/e2e/pkg/infra/digitalocean/digitalocean.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/exec" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra" ) var _ infra.Provider = (*Provider)(nil) diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index d9eec4d..aa5fd0a 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -7,9 +7,9 @@ import ( "path/filepath" "text/template" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/exec" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra" ) var _ infra.Provider = (*Provider)(nil) diff --git a/test/e2e/pkg/infra/provider.go b/test/e2e/pkg/infra/provider.go index 9363859..71afba9 100644 --- a/test/e2e/pkg/infra/provider.go +++ b/test/e2e/pkg/infra/provider.go @@ -3,7 +3,7 @@ package infra import ( "context" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" ) // Provider defines an API for manipulating the infrastructure of a diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go index 0bbd585..782e2f6 100644 --- a/test/e2e/pkg/testnet.go +++ b/test/e2e/pkg/testnet.go @@ -14,12 +14,12 @@ import ( "text/template" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/secp256k1" - "github.com/cometbft/cometbft/crypto/sr25519" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/secp256k1" + "git.cw.tr/mukan-network/mukan-consensus/crypto/sr25519" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + "git.cw.tr/mukan-network/mukan-consensus/types" _ "embed" ) diff --git a/test/e2e/runner/benchmark.go b/test/e2e/runner/benchmark.go index 5551ada..fedeff3 100644 --- a/test/e2e/runner/benchmark.go +++ b/test/e2e/runner/benchmark.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Benchmark is a simple function for fetching, calculating and printing diff --git a/test/e2e/runner/cleanup.go b/test/e2e/runner/cleanup.go index d5564c5..7857248 100644 --- a/test/e2e/runner/cleanup.go +++ b/test/e2e/runner/cleanup.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/docker" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/exec" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra/docker" ) // Cleanup removes the Docker Compose containers and testnet directory. diff --git a/test/e2e/runner/evidence.go b/test/e2e/runner/evidence.go index 1c8dd40..3f61ea0 100644 --- a/test/e2e/runner/evidence.go +++ b/test/e2e/runner/evidence.go @@ -10,16 +10,16 @@ import ( "path/filepath" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/internal/test" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + "git.cw.tr/mukan-network/mukan-consensus/privval" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/types" + "git.cw.tr/mukan-network/mukan-consensus/version" ) // 1 in 4 evidence is light client evidence, the rest is duplicate vote evidence diff --git a/test/e2e/runner/load.go b/test/e2e/runner/load.go index 91e9b68..ad53f97 100644 --- a/test/e2e/runner/load.go +++ b/test/e2e/runner/load.go @@ -7,11 +7,11 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/log" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/loadtime/payload" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/payload" + "git.cw.tr/mukan-network/mukan-consensus/types" "github.com/google/uuid" ) diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go index ca74bd5..3308fcf 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/digitalocean" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/docker" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra/digitalocean" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra/docker" ) const randomSeed = 2308084734268 diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go index 6a77362..0455b8a 100644 --- a/test/e2e/runner/perturb.go +++ b/test/e2e/runner/perturb.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/log" - rpctypes "github.com/cometbft/cometbft/rpc/core/types" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/docker" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra/docker" ) // Perturbs a running testnet. diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go index 5a69058..8cf25d3 100644 --- a/test/e2e/runner/rpc.go +++ b/test/e2e/runner/rpc.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpctypes "github.com/cometbft/cometbft/rpc/core/types" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // waitForHeight waits for the network to reach a certain height (or above), diff --git a/test/e2e/runner/setup.go b/test/e2e/runner/setup.go index 6ad5613..7451ff4 100644 --- a/test/e2e/runner/setup.go +++ b/test/e2e/runner/setup.go @@ -15,14 +15,14 @@ import ( "github.com/BurntSushi/toml" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/config" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + "git.cw.tr/mukan-network/mukan-consensus/p2p" + "git.cw.tr/mukan-network/mukan-consensus/privval" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra" + "git.cw.tr/mukan-network/mukan-consensus/types" ) const ( diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go index d73f381..a06ec64 100644 --- a/test/e2e/runner/start.go +++ b/test/e2e/runner/start.go @@ -6,9 +6,9 @@ import ( "sort" "time" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/infra" ) func Start(ctx context.Context, testnet *e2e.Testnet, p infra.Provider) error { diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go index 4c2a3fb..489d7d0 100644 --- a/test/e2e/runner/test.go +++ b/test/e2e/runner/test.go @@ -4,8 +4,8 @@ import ( "context" "os" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg/exec" ) // Test runs test cases under tests/ diff --git a/test/e2e/runner/wait.go b/test/e2e/runner/wait.go index 6006f82..a24f524 100644 --- a/test/e2e/runner/wait.go +++ b/test/e2e/runner/wait.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" ) // Wait waits for a number of blocks to be produced, and for all nodes to catch diff --git a/test/e2e/tests/app_test.go b/test/e2e/tests/app_test.go index aa5afd8..519136d 100644 --- a/test/e2e/tests/app_test.go +++ b/test/e2e/tests/app_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Tests that any initial state given in genesis has made it into the app. diff --git a/test/e2e/tests/block_test.go b/test/e2e/tests/block_test.go index 884fbaf..3e988d8 100644 --- a/test/e2e/tests/block_test.go +++ b/test/e2e/tests/block_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" ) // Tests that block headers are identical across nodes where present. diff --git a/test/e2e/tests/e2e_test.go b/test/e2e/tests/e2e_test.go index b2fc087..21c8f6a 100644 --- a/test/e2e/tests/e2e_test.go +++ b/test/e2e/tests/e2e_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpctypes "github.com/cometbft/cometbft/rpc/core/types" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + rpchttp "git.cw.tr/mukan-network/mukan-consensus/rpc/client/http" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/core/types" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/types" ) func init() { diff --git a/test/e2e/tests/net_test.go b/test/e2e/tests/net_test.go index 756307b..504eb15 100644 --- a/test/e2e/tests/net_test.go +++ b/test/e2e/tests/net_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" ) // Tests that all nodes have peered with each other, regardless of discovery method. diff --git a/test/e2e/tests/validator_test.go b/test/e2e/tests/validator_test.go index 92cd232..6a8a355 100644 --- a/test/e2e/tests/validator_test.go +++ b/test/e2e/tests/validator_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + e2e "git.cw.tr/mukan-network/mukan-consensus/test/e2e/pkg" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // Tests that validator sets are available and correct according to diff --git a/test/fuzz/mempool/checktx.go b/test/fuzz/mempool/checktx.go index 6db5d6e..cd6b545 100644 --- a/test/fuzz/mempool/checktx.go +++ b/test/fuzz/mempool/checktx.go @@ -1,10 +1,10 @@ package reactor import ( - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/config" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/config" + mempl "git.cw.tr/mukan-network/mukan-consensus/mempool" + "git.cw.tr/mukan-network/mukan-consensus/proxy" ) var mempool mempl.Mempool diff --git a/test/fuzz/mempool/fuzz_test.go b/test/fuzz/mempool/fuzz_test.go index 8b45787..949ea03 100644 --- a/test/fuzz/mempool/fuzz_test.go +++ b/test/fuzz/mempool/fuzz_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - mempl "github.com/cometbft/cometbft/test/fuzz/mempool" + mempl "git.cw.tr/mukan-network/mukan-consensus/test/fuzz/mempool" ) const testdataCasesDir = "testdata/cases" diff --git a/test/fuzz/tests/mempool_test.go b/test/fuzz/tests/mempool_test.go index e6cfd4c..7e0e288 100644 --- a/test/fuzz/tests/mempool_test.go +++ b/test/fuzz/tests/mempool_test.go @@ -5,11 +5,11 @@ package tests import ( "testing" - abciclient "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/config" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempool "github.com/cometbft/cometbft/mempool" + abciclient "git.cw.tr/mukan-network/mukan-consensus/abci/client" + "git.cw.tr/mukan-network/mukan-consensus/abci/example/kvstore" + "git.cw.tr/mukan-network/mukan-consensus/config" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + mempool "git.cw.tr/mukan-network/mukan-consensus/mempool" ) func FuzzMempool(f *testing.F) { diff --git a/test/fuzz/tests/p2p_secretconnection_test.go b/test/fuzz/tests/p2p_secretconnection_test.go index 1162ffe..4261734 100644 --- a/test/fuzz/tests/p2p_secretconnection_test.go +++ b/test/fuzz/tests/p2p_secretconnection_test.go @@ -9,9 +9,9 @@ import ( "log" "testing" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/async" - sc "github.com/cometbft/cometbft/p2p/conn" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/libs/async" + sc "git.cw.tr/mukan-network/mukan-consensus/p2p/conn" ) func FuzzP2PSecretConnection(f *testing.F) { diff --git a/test/fuzz/tests/rpc_jsonrpc_server_test.go b/test/fuzz/tests/rpc_jsonrpc_server_test.go index c6847a5..6b2de55 100644 --- a/test/fuzz/tests/rpc_jsonrpc_server_test.go +++ b/test/fuzz/tests/rpc_jsonrpc_server_test.go @@ -10,9 +10,9 @@ import ( "net/http/httptest" "testing" - "github.com/cometbft/cometbft/libs/log" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + rpcserver "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/server" + rpctypes "git.cw.tr/mukan-network/mukan-consensus/rpc/jsonrpc/types" ) func FuzzRPCJSONRPCServer(f *testing.F) { diff --git a/test/loadtime/cmd/load/main.go b/test/loadtime/cmd/load/main.go index 9b986bd..5c11975 100644 --- a/test/loadtime/cmd/load/main.go +++ b/test/loadtime/cmd/load/main.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/informalsystems/tm-load-test/pkg/loadtest" - "github.com/cometbft/cometbft/test/loadtime/payload" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/payload" ) // Ensure all of the interfaces are correctly satisfied. diff --git a/test/loadtime/cmd/report/main.go b/test/loadtime/cmd/report/main.go index d58b6c8..f3d26a8 100644 --- a/test/loadtime/cmd/report/main.go +++ b/test/loadtime/cmd/report/main.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - dbm "github.com/cometbft/cometbft-db" + dbm "git.cw.tr/mukan-network/mukan-consensus-db" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/test/loadtime/report" + "git.cw.tr/mukan-network/mukan-consensus/store" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/report" ) var ( diff --git a/test/loadtime/payload/payload_test.go b/test/loadtime/payload/payload_test.go index c889192..b03c150 100644 --- a/test/loadtime/payload/payload_test.go +++ b/test/loadtime/payload/payload_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" - "github.com/cometbft/cometbft/test/loadtime/payload" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/payload" ) const payloadSizeTarget = 1024 // 1kb diff --git a/test/loadtime/report/report.go b/test/loadtime/report/report.go index ddf5db1..3ed1f59 100644 --- a/test/loadtime/report/report.go +++ b/test/loadtime/report/report.go @@ -9,8 +9,8 @@ import ( "github.com/gofrs/uuid" "gonum.org/v1/gonum/stat" - "github.com/cometbft/cometbft/test/loadtime/payload" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/payload" + "git.cw.tr/mukan-network/mukan-consensus/types" ) // BlockStore defines the set of methods needed by the report generator from diff --git a/test/loadtime/report/report_test.go b/test/loadtime/report/report_test.go index c37f1dd..292490f 100644 --- a/test/loadtime/report/report_test.go +++ b/test/loadtime/report/report_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/uuid" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/cometbft/cometbft/test/loadtime/payload" - "github.com/cometbft/cometbft/test/loadtime/report" - "github.com/cometbft/cometbft/types" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/payload" + "git.cw.tr/mukan-network/mukan-consensus/test/loadtime/report" + "git.cw.tr/mukan-network/mukan-consensus/types" ) type mockBlockStore struct { diff --git a/types/block.go b/types/block.go index 02ef879..d408632 100644 --- a/types/block.go +++ b/types/block.go @@ -10,16 +10,16 @@ import ( "github.com/cosmos/gogoproto/proto" gogotypes "github.com/cosmos/gogoproto/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bits" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) const ( @@ -326,7 +326,7 @@ func MaxDataBytesNoEvidence(maxBytes int64, valsCount int) int64 { // NOTE: changes to the Header should be duplicated in: // - header.Hash() // - abci.Header -// - https://github.com/cometbft/cometbft/blob/v0.38.x/spec/blockchain/blockchain.md +// - https://git.cw.tr/mukan-network/mukan-consensus/blob/v0.38.x/spec/blockchain/blockchain.md type Header struct { // basic block info Version cmtversion.Consensus `json:"version"` diff --git a/types/block_meta.go b/types/block_meta.go index dcc10a1..34afad6 100644 --- a/types/block_meta.go +++ b/types/block_meta.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // BlockMeta contains meta information. diff --git a/types/block_meta_test.go b/types/block_meta_test.go index 6c954d4..c1e2188 100644 --- a/types/block_meta_test.go +++ b/types/block_meta_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) func TestBlockMeta_ToProto(t *testing.T) { diff --git a/types/block_test.go b/types/block_test.go index 47ae8a7..2cb13b7 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -16,16 +16,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bits" - "github.com/cometbft/cometbft/libs/bytes" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" + "git.cw.tr/mukan-network/mukan-consensus/version" ) func TestMain(m *testing.M) { diff --git a/types/canonical.go b/types/canonical.go index b930e3e..1198d71 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -3,8 +3,8 @@ package types import ( "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) // Canonical* wraps the structs in types for amino encoding them for use in SignBytes / the Signable interface. diff --git a/types/canonical_test.go b/types/canonical_test.go index bab935f..71057ea 100644 --- a/types/canonical_test.go +++ b/types/canonical_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) func TestCanonicalizeBlockID(t *testing.T) { diff --git a/types/encoding_helper.go b/types/encoding_helper.go index 9f74583..e3d369d 100644 --- a/types/encoding_helper.go +++ b/types/encoding_helper.go @@ -3,7 +3,7 @@ package types import ( gogotypes "github.com/cosmos/gogoproto/types" - "github.com/cometbft/cometbft/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" ) // cdcEncode returns nil if the input is nil, otherwise returns diff --git a/types/event_bus.go b/types/event_bus.go index 24cea50..0bcc854 100644 --- a/types/event_bus.go +++ b/types/event_bus.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/service" + "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/log" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + "git.cw.tr/mukan-network/mukan-consensus/libs/service" ) const defaultCapacity = 0 diff --git a/types/event_bus_test.go b/types/event_bus_test.go index bb4461d..1306ac1 100644 --- a/types/event_bus_test.go +++ b/types/event_bus_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + cmtquery "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" ) func TestEventBusPublishEventTx(t *testing.T) { diff --git a/types/events.go b/types/events.go index 6f4988a..43849c6 100644 --- a/types/events.go +++ b/types/events.go @@ -3,10 +3,10 @@ package types import ( "fmt" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtpubsub "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub" + cmtquery "git.cw.tr/mukan-network/mukan-consensus/libs/pubsub/query" ) // Reserved event types (alphabetically sorted). diff --git a/types/evidence.go b/types/evidence.go index cd3c822..56b6bb6 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -9,12 +9,12 @@ import ( "strings" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // Evidence represents any provable malicious activity by a validator. diff --git a/types/evidence_test.go b/types/evidence_test.go index d44fbc7..973670f 100644 --- a/types/evidence_test.go +++ b/types/evidence_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) var defaultVoteTime = time.Date(2019, 1, 1, 0, 0, 0, 0, time.UTC) diff --git a/types/genesis.go b/types/genesis.go index e415142..c32eebb 100644 --- a/types/genesis.go +++ b/types/genesis.go @@ -8,11 +8,11 @@ import ( "os" "time" - "github.com/cometbft/cometbft/crypto" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtos "git.cw.tr/mukan-network/mukan-consensus/libs/os" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) const ( diff --git a/types/genesis_test.go b/types/genesis_test.go index d4485f8..8b556e9 100644 --- a/types/genesis_test.go +++ b/types/genesis_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) func TestGenesisBad(t *testing.T) { diff --git a/types/light.go b/types/light.go index c6178b2..0458793 100644 --- a/types/light.go +++ b/types/light.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // LightBlock is a SignedHeader and a ValidatorSet. diff --git a/types/light_test.go b/types/light_test.go index 9a30761..22d7c60 100644 --- a/types/light_test.go +++ b/types/light_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/crypto" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/version" ) func TestLightBlockValidateBasic(t *testing.T) { diff --git a/types/params.go b/types/params.go index c69297b..9eb0087 100644 --- a/types/params.go +++ b/types/params.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/secp256k1" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/secp256k1" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) const ( diff --git a/types/params_test.go b/types/params_test.go index c4d0847..f4ee6c0 100644 --- a/types/params_test.go +++ b/types/params_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) var ( diff --git a/types/part_set.go b/types/part_set.go index 917a770..787a53a 100644 --- a/types/part_set.go +++ b/types/part_set.go @@ -6,13 +6,13 @@ import ( "fmt" "io" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/bits" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) var ( diff --git a/types/part_set_test.go b/types/part_set_test.go index 65323f4..34598b4 100644 --- a/types/part_set_test.go +++ b/types/part_set_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/merkle" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" ) const ( diff --git a/types/priv_validator.go b/types/priv_validator.go index 9d5491b..9c9c74d 100644 --- a/types/priv_validator.go +++ b/types/priv_validator.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // PrivValidator defines the functionality of a local CometBFT validator diff --git a/types/proposal.go b/types/proposal.go index ebbe569..eaee1a2 100644 --- a/types/proposal.go +++ b/types/proposal.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/protoio" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) var ( diff --git a/types/proposal_test.go b/types/proposal_test.go index 359f5ff..0c613cc 100644 --- a/types/proposal_test.go +++ b/types/proposal_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/protoio" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) var ( diff --git a/types/protobuf.go b/types/protobuf.go index 4ad3a13..a8756a6 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -1,10 +1,10 @@ package types import ( - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) //------------------------------------------------------- diff --git a/types/protobuf_test.go b/types/protobuf_test.go index 1a974c0..a605b94 100644 --- a/types/protobuf_test.go +++ b/types/protobuf_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" ) func TestABCIPubKey(t *testing.T) { diff --git a/types/results.go b/types/results.go index a401979..d232620 100644 --- a/types/results.go +++ b/types/results.go @@ -1,8 +1,8 @@ package types import ( - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" ) // ABCIResults wraps the deliver tx results to return a proof. diff --git a/types/results_test.go b/types/results_test.go index d1c8ede..f6e8b22 100644 --- a/types/results_test.go +++ b/types/results_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" + abci "git.cw.tr/mukan-network/mukan-consensus/abci/types" ) func TestABCIResults(t *testing.T) { diff --git a/types/signable.go b/types/signable.go index c7f5683..2be6b99 100644 --- a/types/signable.go +++ b/types/signable.go @@ -1,8 +1,8 @@ package types import ( - "github.com/cometbft/cometbft/crypto/ed25519" - cmtmath "github.com/cometbft/cometbft/libs/math" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" ) var ( diff --git a/types/signed_msg_type.go b/types/signed_msg_type.go index 63a50ee..967b8d8 100644 --- a/types/signed_msg_type.go +++ b/types/signed_msg_type.go @@ -1,6 +1,6 @@ package types -import cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" +import cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" // IsVoteTypeValid returns true if t is a valid vote type. func IsVoteTypeValid(t cmtproto.SignedMsgType) bool { diff --git a/types/test_util.go b/types/test_util.go index d284bfd..8817f77 100644 --- a/types/test_util.go +++ b/types/test_util.go @@ -5,9 +5,9 @@ import ( "testing" "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmtversion "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/version" + "git.cw.tr/mukan-network/mukan-consensus/version" "github.com/stretchr/testify/require" ) diff --git a/types/tx.go b/types/tx.go index 65ef197..dd09a97 100644 --- a/types/tx.go +++ b/types/tx.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // TxKeySize is the size of the transaction key index diff --git a/types/tx_test.go b/types/tx_test.go index 222d78b..e0b0fd8 100644 --- a/types/tx_test.go +++ b/types/tx_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" - ctest "github.com/cometbft/cometbft/libs/test" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + ctest "git.cw.tr/mukan-network/mukan-consensus/libs/test" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) func makeTxs(cnt, size int) Txs { diff --git a/types/validation.go b/types/validation.go index 4ce5bdc..6967bc8 100644 --- a/types/validation.go +++ b/types/validation.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto/batch" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtmath "github.com/cometbft/cometbft/libs/math" + "git.cw.tr/mukan-network/mukan-consensus/crypto/batch" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" ) const batchVerifyThreshold = 2 diff --git a/types/validation_test.go b/types/validation_test.go index e835405..dea4326 100644 --- a/types/validation_test.go +++ b/types/validation_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // Check VerifyCommit, VerifyCommitLight and VerifyCommitLightTrusting basic diff --git a/types/validator.go b/types/validator.go index 98d33e2..b78e04f 100644 --- a/types/validator.go +++ b/types/validator.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/crypto" - ce "github.com/cometbft/cometbft/crypto/encoding" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + ce "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) // Volatile state for each Validator diff --git a/types/validator_set.go b/types/validator_set.go index 5f147d0..2e22e06 100644 --- a/types/validator_set.go +++ b/types/validator_set.go @@ -10,10 +10,10 @@ import ( "sort" "strings" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto/merkle" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) const ( diff --git a/types/validator_set_test.go b/types/validator_set_test.go index 1673233..995f149 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/sr25519" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + cryptoenc "git.cw.tr/mukan-network/mukan-consensus/crypto/encoding" + "git.cw.tr/mukan-network/mukan-consensus/crypto/sr25519" + cmtmath "git.cw.tr/mukan-network/mukan-consensus/libs/math" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) func TestValidatorSetBasic(t *testing.T) { diff --git a/types/vote.go b/types/vote.go index db3f340..dbc431e 100644 --- a/types/vote.go +++ b/types/vote.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/protoio" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtbytes "git.cw.tr/mukan-network/mukan-consensus/libs/bytes" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) const ( diff --git a/types/vote_set.go b/types/vote_set.go index c30e590..dc473fd 100644 --- a/types/vote_set.go +++ b/types/vote_set.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/libs/bits" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "git.cw.tr/mukan-network/mukan-consensus/libs/bits" + cmtjson "git.cw.tr/mukan-network/mukan-consensus/libs/json" + cmtsync "git.cw.tr/mukan-network/mukan-consensus/libs/sync" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" ) const ( diff --git a/types/vote_set_test.go b/types/vote_set_test.go index 810921b..0bdbc14 100644 --- a/types/vote_set_test.go +++ b/types/vote_set_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + cmtrand "git.cw.tr/mukan-network/mukan-consensus/libs/rand" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) func TestVoteSet_AddVote_Good(t *testing.T) { diff --git a/types/vote_test.go b/types/vote_test.go index 389ed9a..feaa7f2 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/protoio" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + "git.cw.tr/mukan-network/mukan-consensus/crypto" + "git.cw.tr/mukan-network/mukan-consensus/crypto/ed25519" + "git.cw.tr/mukan-network/mukan-consensus/crypto/tmhash" + "git.cw.tr/mukan-network/mukan-consensus/libs/protoio" + cmtproto "git.cw.tr/mukan-network/mukan-consensus/proto/tendermint/types" + cmttime "git.cw.tr/mukan-network/mukan-consensus/types/time" ) func examplePrevote() *Vote {