From 1c4950dbd2f842affa5418086bd226086c73b60f Mon Sep 17 00:00:00 2001 From: Sam Kleinman Date: Wed, 22 Sep 2021 13:04:25 -0400 Subject: [PATCH] state: move package to internal (#6964) --- cmd/tendermint/commands/reindex_event.go | 10 +++++----- cmd/tendermint/commands/reindex_event_test.go | 4 ++-- internal/blocksync/v0/reactor.go | 2 +- internal/blocksync/v0/reactor_test.go | 4 ++-- internal/blocksync/v2/io.go | 2 +- internal/blocksync/v2/processor.go | 2 +- internal/blocksync/v2/processor_context.go | 2 +- internal/blocksync/v2/processor_test.go | 2 +- internal/blocksync/v2/reactor.go | 2 +- internal/blocksync/v2/reactor_test.go | 4 ++-- internal/blocksync/v2/scheduler_test.go | 2 +- internal/consensus/byzantine_test.go | 2 +- internal/consensus/common_test.go | 2 +- internal/consensus/mempool_test.go | 2 +- internal/consensus/mocks/cons_sync_reactor.go | 2 +- internal/consensus/mocks/fast_sync_reactor.go | 2 +- internal/consensus/reactor.go | 2 +- internal/consensus/reactor_test.go | 4 ++-- internal/consensus/replay.go | 2 +- internal/consensus/replay_file.go | 2 +- internal/consensus/replay_test.go | 4 ++-- internal/consensus/state.go | 2 +- internal/consensus/wal_generator.go | 2 +- internal/evidence/pool.go | 2 +- internal/evidence/pool_test.go | 6 +++--- internal/evidence/reactor_test.go | 2 +- internal/evidence/verify_test.go | 4 ++-- internal/inspect/inspect.go | 8 ++++---- internal/inspect/inspect_test.go | 6 +++--- internal/inspect/rpc/rpc.go | 6 +++--- {rpc => internal/rpc}/core/CONTRIBUTING.md | 0 {rpc => internal/rpc}/core/README.md | 0 {rpc => internal/rpc}/core/abci.go | 2 +- {rpc => internal/rpc}/core/blocks.go | 4 ++-- {rpc => internal/rpc}/core/blocks_test.go | 4 ++-- {rpc => internal/rpc}/core/consensus.go | 2 +- {rpc => internal/rpc}/core/dev.go | 2 +- {rpc => internal/rpc}/core/doc.go | 0 {rpc => internal/rpc}/core/doc_template.txt | 0 {rpc => internal/rpc}/core/env.go | 6 +++--- {rpc => internal/rpc}/core/env_test.go | 0 {rpc => internal/rpc}/core/events.go | 2 +- {rpc => internal/rpc}/core/evidence.go | 2 +- {rpc => internal/rpc}/core/health.go | 2 +- {rpc => internal/rpc}/core/mempool.go | 2 +- {rpc => internal/rpc}/core/net.go | 2 +- {rpc => internal/rpc}/core/net_test.go | 0 {rpc => internal/rpc}/core/routes.go | 0 {rpc => internal/rpc}/core/status.go | 2 +- {rpc => internal/rpc}/core/tx.go | 4 ++-- {state => internal/state}/errors.go | 0 {state => internal/state}/execution.go | 0 {state => internal/state}/execution_test.go | 6 +++--- {state => internal/state}/export_test.go | 0 {state => internal/state}/helpers_test.go | 4 ++-- {state => internal/state}/indexer/block/kv/kv.go | 2 +- {state => internal/state}/indexer/block/kv/kv_test.go | 2 +- {state => internal/state}/indexer/block/kv/util.go | 0 {state => internal/state}/indexer/block/null/null.go | 2 +- {state => internal/state}/indexer/doc.go | 0 {state => internal/state}/indexer/eventsink.go | 0 {state => internal/state}/indexer/indexer.go | 0 {state => internal/state}/indexer/indexer_service.go | 0 .../state}/indexer/indexer_service_test.go | 6 +++--- {state => internal/state}/indexer/mocks/event_sink.go | 2 +- {state => internal/state}/indexer/query_range.go | 0 {state => internal/state}/indexer/sink/kv/kv.go | 6 +++--- {state => internal/state}/indexer/sink/kv/kv_test.go | 4 ++-- {state => internal/state}/indexer/sink/null/null.go | 2 +- .../state}/indexer/sink/null/null_test.go | 2 +- {state => internal/state}/indexer/sink/psql/psql.go | 2 +- .../state}/indexer/sink/psql/psql_test.go | 2 +- {state => internal/state}/indexer/sink/psql/schema.sql | 0 {state => internal/state}/indexer/sink/sink.go | 8 ++++---- {state => internal/state}/indexer/tx/kv/kv.go | 2 +- .../state}/indexer/tx/kv/kv_bench_test.go | 0 {state => internal/state}/indexer/tx/kv/kv_test.go | 2 +- {state => internal/state}/indexer/tx/kv/utils.go | 0 {state => internal/state}/indexer/tx/kv/utils_test.go | 0 {state => internal/state}/indexer/tx/null/null.go | 2 +- {state => internal/state}/metrics.go | 0 {state => internal/state}/mocks/block_store.go | 0 {state => internal/state}/mocks/event_sink.go | 2 +- {state => internal/state}/mocks/evidence_pool.go | 2 +- {state => internal/state}/mocks/store.go | 2 +- {state => internal/state}/services.go | 0 {state => internal/state}/state.go | 0 {state => internal/state}/state_test.go | 4 ++-- {state => internal/state}/store.go | 0 {state => internal/state}/store_test.go | 2 +- {state => internal/state}/test/factory/block.go | 2 +- {state => internal/state}/time.go | 0 {state => internal/state}/time_test.go | 0 {state => internal/state}/tx_filter.go | 0 {state => internal/state}/tx_filter_test.go | 2 +- {state => internal/state}/validation.go | 0 {state => internal/state}/validation_test.go | 6 +++--- internal/statesync/mocks/state_provider.go | 2 +- internal/statesync/reactor.go | 2 +- internal/statesync/reactor_test.go | 2 +- internal/statesync/stateprovider.go | 2 +- internal/statesync/syncer.go | 2 +- internal/statesync/syncer_test.go | 2 +- light/provider/http/http.go | 2 +- light/proxy/routes.go | 2 +- light/rpc/client.go | 2 +- node/node.go | 4 ++-- node/node_test.go | 4 ++-- node/setup.go | 6 +++--- proto/tendermint/state/types.pb.go | 4 ++-- proto/tendermint/statesync/types.pb.go | 4 ++-- rpc/client/event_test.go | 2 +- rpc/client/examples_test.go | 2 +- rpc/client/helpers_test.go | 2 +- rpc/client/http/http.go | 2 +- rpc/client/http/ws.go | 2 +- rpc/client/interface.go | 2 +- rpc/client/local/local.go | 4 ++-- rpc/client/mock/abci.go | 2 +- rpc/client/mock/abci_test.go | 2 +- rpc/client/mock/client.go | 4 ++-- rpc/client/mock/status.go | 2 +- rpc/client/mock/status_test.go | 2 +- rpc/client/mocks/client.go | 2 +- rpc/client/rpc_test.go | 2 +- rpc/{core/types => coretypes}/responses.go | 0 rpc/{core/types => coretypes}/responses_test.go | 0 rpc/grpc/api.go | 2 +- rpc/grpc/client_server.go | 2 +- rpc/jsonrpc/server/http_json_handler.go | 2 +- rpc/jsonrpc/server/http_uri_handler.go | 2 +- rpc/jsonrpc/server/ws_handler.go | 2 +- rpc/test/helpers.go | 2 +- store/store_test.go | 4 ++-- test/e2e/runner/perturb.go | 2 +- test/e2e/runner/rpc.go | 2 +- test/e2e/tests/e2e_test.go | 2 +- tools/tm-signer-harness/internal/test_harness.go | 2 +- 138 files changed, 154 insertions(+), 154 deletions(-) rename {rpc => internal/rpc}/core/CONTRIBUTING.md (100%) rename {rpc => internal/rpc}/core/README.md (100%) rename {rpc => internal/rpc}/core/abci.go (95%) rename {rpc => internal/rpc}/core/blocks.go (98%) rename {rpc => internal/rpc}/core/blocks_test.go (97%) rename {rpc => internal/rpc}/core/consensus.go (98%) rename {rpc => internal/rpc}/core/dev.go (85%) rename {rpc => internal/rpc}/core/doc.go (100%) rename {rpc => internal/rpc}/core/doc_template.txt (100%) rename {rpc => internal/rpc}/core/env.go (96%) rename {rpc => internal/rpc}/core/env_test.go (100%) rename {rpc => internal/rpc}/core/events.go (98%) rename {rpc => internal/rpc}/core/evidence.go (93%) rename {rpc => internal/rpc}/core/health.go (86%) rename {rpc => internal/rpc}/core/mempool.go (99%) rename {rpc => internal/rpc}/core/net.go (98%) rename {rpc => internal/rpc}/core/net_test.go (100%) rename {rpc => internal/rpc}/core/routes.go (100%) rename {rpc => internal/rpc}/core/status.go (98%) rename {rpc => internal/rpc}/core/tx.go (97%) rename {state => internal/state}/errors.go (100%) rename {state => internal/state}/execution.go (100%) rename {state => internal/state}/execution_test.go (98%) rename {state => internal/state}/export_test.go (100%) rename {state => internal/state}/helpers_test.go (98%) rename {state => internal/state}/indexer/block/kv/kv.go (99%) rename {state => internal/state}/indexer/block/kv/kv_test.go (97%) rename {state => internal/state}/indexer/block/kv/util.go (100%) rename {state => internal/state}/indexer/block/null/null.go (91%) rename {state => internal/state}/indexer/doc.go (100%) rename {state => internal/state}/indexer/eventsink.go (100%) rename {state => internal/state}/indexer/indexer.go (100%) rename {state => internal/state}/indexer/indexer_service.go (100%) rename {state => internal/state}/indexer/indexer_service_test.go (95%) rename {state => internal/state}/indexer/mocks/event_sink.go (98%) rename {state => internal/state}/indexer/query_range.go (100%) rename {state => internal/state}/indexer/sink/kv/kv.go (87%) rename {state => internal/state}/indexer/sink/kv/kv_test.go (98%) rename {state => internal/state}/indexer/sink/null/null.go (94%) rename {state => internal/state}/indexer/sink/null/null_test.go (93%) rename {state => internal/state}/indexer/sink/psql/psql.go (99%) rename {state => internal/state}/indexer/sink/psql/psql_test.go (99%) rename {state => internal/state}/indexer/sink/psql/schema.sql (100%) rename {state => internal/state}/indexer/sink/sink.go (85%) rename {state => internal/state}/indexer/tx/kv/kv.go (99%) rename {state => internal/state}/indexer/tx/kv/kv_bench_test.go (100%) rename {state => internal/state}/indexer/tx/kv/kv_test.go (99%) rename {state => internal/state}/indexer/tx/kv/utils.go (100%) rename {state => internal/state}/indexer/tx/kv/utils_test.go (100%) rename {state => internal/state}/indexer/tx/null/null.go (93%) rename {state => internal/state}/metrics.go (100%) rename {state => internal/state}/mocks/block_store.go (100%) rename {state => internal/state}/mocks/event_sink.go (98%) rename {state => internal/state}/mocks/evidence_pool.go (96%) rename {state => internal/state}/mocks/store.go (98%) rename {state => internal/state}/services.go (100%) rename {state => internal/state}/state.go (100%) rename {state => internal/state}/state_test.go (99%) rename {state => internal/state}/store.go (100%) rename {state => internal/state}/store_test.go (99%) rename {state => internal/state}/test/factory/block.go (96%) rename {state => internal/state}/time.go (100%) rename {state => internal/state}/time_test.go (100%) rename {state => internal/state}/tx_filter.go (100%) rename {state => internal/state}/tx_filter_test.go (94%) rename {state => internal/state}/validation.go (100%) rename {state => internal/state}/validation_test.go (98%) rename rpc/{core/types => coretypes}/responses.go (100%) rename rpc/{core/types => coretypes}/responses_test.go (100%) diff --git a/cmd/tendermint/commands/reindex_event.go b/cmd/tendermint/commands/reindex_event.go index 1dbce2f74..b5e98a29a 100644 --- a/cmd/tendermint/commands/reindex_event.go +++ b/cmd/tendermint/commands/reindex_event.go @@ -11,11 +11,11 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmcfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/internal/libs/progressbar" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/indexer/sink/kv" - "github.com/tendermint/tendermint/state/indexer/sink/psql" + "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/indexer" + "github.com/tendermint/tendermint/internal/state/indexer/sink/kv" + "github.com/tendermint/tendermint/internal/state/indexer/sink/psql" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/cmd/tendermint/commands/reindex_event_test.go b/cmd/tendermint/commands/reindex_event_test.go index 5d9459f5a..452a6b2a8 100644 --- a/cmd/tendermint/commands/reindex_event_test.go +++ b/cmd/tendermint/commands/reindex_event_test.go @@ -11,9 +11,9 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmcfg "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint/internal/state/indexer" + "github.com/tendermint/tendermint/internal/state/mocks" prototmstate "github.com/tendermint/tendermint/proto/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/mocks" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v0/reactor.go b/internal/blocksync/v0/reactor.go index 4ddfa4edc..645b39b4c 100644 --- a/internal/blocksync/v0/reactor.go +++ b/internal/blocksync/v0/reactor.go @@ -9,11 +9,11 @@ import ( bc "github.com/tendermint/tendermint/internal/blocksync" cons "github.com/tendermint/tendermint/internal/consensus" "github.com/tendermint/tendermint/internal/p2p" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" tmSync "github.com/tendermint/tendermint/libs/sync" bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v0/reactor_test.go b/internal/blocksync/v0/reactor_test.go index 0d6bc9b18..9a79c8cf3 100644 --- a/internal/blocksync/v0/reactor_test.go +++ b/internal/blocksync/v0/reactor_test.go @@ -15,11 +15,11 @@ import ( "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/p2p/p2ptest" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync" - sm "github.com/tendermint/tendermint/state" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" diff --git a/internal/blocksync/v2/io.go b/internal/blocksync/v2/io.go index 743428516..b272db3ae 100644 --- a/internal/blocksync/v2/io.go +++ b/internal/blocksync/v2/io.go @@ -5,8 +5,8 @@ import ( "github.com/gogo/protobuf/proto" "github.com/tendermint/tendermint/internal/p2p" + "github.com/tendermint/tendermint/internal/state" bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync" - "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v2/processor.go b/internal/blocksync/v2/processor.go index b448e7d8a..12959d5b1 100644 --- a/internal/blocksync/v2/processor.go +++ b/internal/blocksync/v2/processor.go @@ -3,7 +3,7 @@ package v2 import ( "fmt" - tmState "github.com/tendermint/tendermint/state" + tmState "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v2/processor_context.go b/internal/blocksync/v2/processor_context.go index bc6852565..caf25e09c 100644 --- a/internal/blocksync/v2/processor_context.go +++ b/internal/blocksync/v2/processor_context.go @@ -4,7 +4,7 @@ import ( "fmt" cons "github.com/tendermint/tendermint/internal/consensus" - "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v2/processor_test.go b/internal/blocksync/v2/processor_test.go index f7d51112b..c9b8c62e1 100644 --- a/internal/blocksync/v2/processor_test.go +++ b/internal/blocksync/v2/processor_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - tmState "github.com/tendermint/tendermint/state" + tmState "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v2/reactor.go b/internal/blocksync/v2/reactor.go index caa5d73f0..bd2b85038 100644 --- a/internal/blocksync/v2/reactor.go +++ b/internal/blocksync/v2/reactor.go @@ -12,10 +12,10 @@ import ( cons "github.com/tendermint/tendermint/internal/consensus" tmsync "github.com/tendermint/tendermint/internal/libs/sync" "github.com/tendermint/tendermint/internal/p2p" + "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/sync" bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync" - "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v2/reactor_test.go b/internal/blocksync/v2/reactor_test.go index 3e8b03ebb..ca8ba41a0 100644 --- a/internal/blocksync/v2/reactor_test.go +++ b/internal/blocksync/v2/reactor_test.go @@ -22,12 +22,12 @@ import ( "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/p2p/conn" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync" - sm "github.com/tendermint/tendermint/state" - sf "github.com/tendermint/tendermint/state/test/factory" tmstore "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/blocksync/v2/scheduler_test.go b/internal/blocksync/v2/scheduler_test.go index 91fac3637..d2c4aab03 100644 --- a/internal/blocksync/v2/scheduler_test.go +++ b/internal/blocksync/v2/scheduler_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/byzantine_test.go b/internal/consensus/byzantine_test.go index f4a74ea6f..a202a4738 100644 --- a/internal/consensus/byzantine_test.go +++ b/internal/consensus/byzantine_test.go @@ -16,11 +16,11 @@ import ( tmsync "github.com/tendermint/tendermint/internal/libs/sync" mempoolv0 "github.com/tendermint/tendermint/internal/mempool/v0" "github.com/tendermint/tendermint/internal/p2p" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" diff --git a/internal/consensus/common_test.go b/internal/consensus/common_test.go index f5c31d02a..b7fdd984e 100644 --- a/internal/consensus/common_test.go +++ b/internal/consensus/common_test.go @@ -25,6 +25,7 @@ import ( cstypes "github.com/tendermint/tendermint/internal/consensus/types" tmsync "github.com/tendermint/tendermint/internal/libs/sync" mempoolv0 "github.com/tendermint/tendermint/internal/mempool/v0" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/internal/test/factory" tmbytes "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/log" @@ -33,7 +34,6 @@ import ( tmtime "github.com/tendermint/tendermint/libs/time" "github.com/tendermint/tendermint/privval" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/mempool_test.go b/internal/consensus/mempool_test.go index 5edec248a..8eb1b3f60 100644 --- a/internal/consensus/mempool_test.go +++ b/internal/consensus/mempool_test.go @@ -16,7 +16,7 @@ import ( "github.com/tendermint/tendermint/abci/example/code" abci "github.com/tendermint/tendermint/abci/types" mempl "github.com/tendermint/tendermint/internal/mempool" - sm "github.com/tendermint/tendermint/state" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/mocks/cons_sync_reactor.go b/internal/consensus/mocks/cons_sync_reactor.go index 263969798..5ac592f0d 100644 --- a/internal/consensus/mocks/cons_sync_reactor.go +++ b/internal/consensus/mocks/cons_sync_reactor.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/tendermint/tendermint/internal/state" ) // ConsSyncReactor is an autogenerated mock type for the ConsSyncReactor type diff --git a/internal/consensus/mocks/fast_sync_reactor.go b/internal/consensus/mocks/fast_sync_reactor.go index b7f521ff2..9da851065 100644 --- a/internal/consensus/mocks/fast_sync_reactor.go +++ b/internal/consensus/mocks/fast_sync_reactor.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/tendermint/tendermint/internal/state" time "time" ) diff --git a/internal/consensus/reactor.go b/internal/consensus/reactor.go index 915756488..ca3f5d353 100644 --- a/internal/consensus/reactor.go +++ b/internal/consensus/reactor.go @@ -8,13 +8,13 @@ import ( cstypes "github.com/tendermint/tendermint/internal/consensus/types" tmsync "github.com/tendermint/tendermint/internal/libs/sync" "github.com/tendermint/tendermint/internal/p2p" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/bits" tmevents "github.com/tendermint/tendermint/libs/events" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/reactor_test.go b/internal/consensus/reactor_test.go index 571b6d832..bb4f72d8c 100644 --- a/internal/consensus/reactor_test.go +++ b/internal/consensus/reactor_test.go @@ -23,12 +23,12 @@ import ( mempoolv0 "github.com/tendermint/tendermint/internal/mempool/v0" "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/p2p/p2ptest" + sm "github.com/tendermint/tendermint/internal/state" + statemocks "github.com/tendermint/tendermint/internal/state/mocks" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" tmpubsub "github.com/tendermint/tendermint/libs/pubsub" tmcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - sm "github.com/tendermint/tendermint/state" - statemocks "github.com/tendermint/tendermint/state/mocks" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" diff --git a/internal/consensus/replay.go b/internal/consensus/replay.go index 2660797c8..60ad0c041 100644 --- a/internal/consensus/replay.go +++ b/internal/consensus/replay.go @@ -12,8 +12,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/merkle" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/replay_file.go b/internal/consensus/replay_file.go index b59024ae1..a3a39fbbc 100644 --- a/internal/consensus/replay_file.go +++ b/internal/consensus/replay_file.go @@ -14,10 +14,10 @@ import ( cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" tmpubsub "github.com/tendermint/tendermint/libs/pubsub" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/replay_test.go b/internal/consensus/replay_test.go index 591796245..c5623e36d 100644 --- a/internal/consensus/replay_test.go +++ b/internal/consensus/replay_test.go @@ -27,14 +27,14 @@ import ( cryptoenc "github.com/tendermint/tendermint/crypto/encoding" mempl "github.com/tendermint/tendermint/internal/mempool" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" "github.com/tendermint/tendermint/privval" tmstate "github.com/tendermint/tendermint/proto/tendermint/state" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 16f2bb0bd..165318c9c 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -17,6 +17,7 @@ import ( cstypes "github.com/tendermint/tendermint/internal/consensus/types" "github.com/tendermint/tendermint/internal/libs/fail" tmsync "github.com/tendermint/tendermint/internal/libs/sync" + sm "github.com/tendermint/tendermint/internal/state" tmevents "github.com/tendermint/tendermint/libs/events" tmjson "github.com/tendermint/tendermint/libs/json" "github.com/tendermint/tendermint/libs/log" @@ -27,7 +28,6 @@ import ( "github.com/tendermint/tendermint/privval" tmgrpc "github.com/tendermint/tendermint/privval/grpc" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/consensus/wal_generator.go b/internal/consensus/wal_generator.go index 4a47c7cc5..b92230d2c 100644 --- a/internal/consensus/wal_generator.go +++ b/internal/consensus/wal_generator.go @@ -17,9 +17,9 @@ import ( "github.com/tendermint/tendermint/abci/example/kvstore" cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/privval" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/evidence/pool.go b/internal/evidence/pool.go index 2a48fe032..f342dec4c 100644 --- a/internal/evidence/pool.go +++ b/internal/evidence/pool.go @@ -14,9 +14,9 @@ import ( dbm "github.com/tendermint/tm-db" clist "github.com/tendermint/tendermint/internal/libs/clist" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/evidence/pool_test.go b/internal/evidence/pool_test.go index ac5f27b8e..5be2ec318 100644 --- a/internal/evidence/pool_test.go +++ b/internal/evidence/pool_test.go @@ -13,11 +13,11 @@ import ( "github.com/tendermint/tendermint/internal/evidence" "github.com/tendermint/tendermint/internal/evidence/mocks" + sm "github.com/tendermint/tendermint/internal/state" + smmocks "github.com/tendermint/tendermint/internal/state/mocks" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" - sm "github.com/tendermint/tendermint/state" - smmocks "github.com/tendermint/tendermint/state/mocks" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/version" diff --git a/internal/evidence/reactor_test.go b/internal/evidence/reactor_test.go index 1cf995731..b8055263d 100644 --- a/internal/evidence/reactor_test.go +++ b/internal/evidence/reactor_test.go @@ -20,9 +20,9 @@ import ( "github.com/tendermint/tendermint/internal/evidence/mocks" "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/p2p/p2ptest" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/evidence/verify_test.go b/internal/evidence/verify_test.go index 85f997f2a..2bb3d8008 100644 --- a/internal/evidence/verify_test.go +++ b/internal/evidence/verify_test.go @@ -15,11 +15,11 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/internal/evidence" "github.com/tendermint/tendermint/internal/evidence/mocks" + sm "github.com/tendermint/tendermint/internal/state" + smmocks "github.com/tendermint/tendermint/internal/state/mocks" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - smmocks "github.com/tendermint/tendermint/state/mocks" "github.com/tendermint/tendermint/types" ) diff --git a/internal/inspect/inspect.go b/internal/inspect/inspect.go index f27baa6ef..c48776d3c 100644 --- a/internal/inspect/inspect.go +++ b/internal/inspect/inspect.go @@ -8,12 +8,12 @@ import ( "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/internal/inspect/rpc" + rpccore "github.com/tendermint/tendermint/internal/rpc/core" + "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/indexer" + "github.com/tendermint/tendermint/internal/state/indexer/sink" "github.com/tendermint/tendermint/libs/log" tmstrings "github.com/tendermint/tendermint/libs/strings" - rpccore "github.com/tendermint/tendermint/rpc/core" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/indexer/sink" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" diff --git a/internal/inspect/inspect_test.go b/internal/inspect/inspect_test.go index 6d814208f..972932440 100644 --- a/internal/inspect/inspect_test.go +++ b/internal/inspect/inspect_test.go @@ -16,13 +16,13 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/internal/inspect" + "github.com/tendermint/tendermint/internal/state/indexer" + indexermocks "github.com/tendermint/tendermint/internal/state/indexer/mocks" + statemocks "github.com/tendermint/tendermint/internal/state/mocks" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/proto/tendermint/state" httpclient "github.com/tendermint/tendermint/rpc/client/http" - "github.com/tendermint/tendermint/state/indexer" - indexermocks "github.com/tendermint/tendermint/state/indexer/mocks" - statemocks "github.com/tendermint/tendermint/state/mocks" "github.com/tendermint/tendermint/types" ) diff --git a/internal/inspect/rpc/rpc.go b/internal/inspect/rpc/rpc.go index 76dcda4eb..3043ba6b3 100644 --- a/internal/inspect/rpc/rpc.go +++ b/internal/inspect/rpc/rpc.go @@ -9,12 +9,12 @@ import ( "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/internal/consensus" + "github.com/tendermint/tendermint/internal/rpc/core" + "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/rpc/core" "github.com/tendermint/tendermint/rpc/jsonrpc/server" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/CONTRIBUTING.md b/internal/rpc/core/CONTRIBUTING.md similarity index 100% rename from rpc/core/CONTRIBUTING.md rename to internal/rpc/core/CONTRIBUTING.md diff --git a/rpc/core/README.md b/internal/rpc/core/README.md similarity index 100% rename from rpc/core/README.md rename to internal/rpc/core/README.md diff --git a/rpc/core/abci.go b/internal/rpc/core/abci.go similarity index 95% rename from rpc/core/abci.go rename to internal/rpc/core/abci.go index 885ae2c23..fe497b336 100644 --- a/rpc/core/abci.go +++ b/internal/rpc/core/abci.go @@ -4,7 +4,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/internal/proxy" "github.com/tendermint/tendermint/libs/bytes" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/core/blocks.go b/internal/rpc/core/blocks.go similarity index 98% rename from rpc/core/blocks.go rename to internal/rpc/core/blocks.go index 78b567583..909d2228f 100644 --- a/rpc/core/blocks.go +++ b/internal/rpc/core/blocks.go @@ -4,12 +4,12 @@ import ( "fmt" "sort" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/bytes" tmmath "github.com/tendermint/tendermint/libs/math" tmquery "github.com/tendermint/tendermint/libs/pubsub/query" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/blocks_test.go b/internal/rpc/core/blocks_test.go similarity index 97% rename from rpc/core/blocks_test.go rename to internal/rpc/core/blocks_test.go index 29db2f094..5b602e339 100644 --- a/rpc/core/blocks_test.go +++ b/internal/rpc/core/blocks_test.go @@ -10,10 +10,10 @@ import ( dbm "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" + sm "github.com/tendermint/tendermint/internal/state" tmstate "github.com/tendermint/tendermint/proto/tendermint/state" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/consensus.go b/internal/rpc/core/consensus.go similarity index 98% rename from rpc/core/consensus.go rename to internal/rpc/core/consensus.go index b067e1063..6fbba0c0f 100644 --- a/rpc/core/consensus.go +++ b/internal/rpc/core/consensus.go @@ -5,7 +5,7 @@ import ( cm "github.com/tendermint/tendermint/internal/consensus" tmmath "github.com/tendermint/tendermint/libs/math" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/dev.go b/internal/rpc/core/dev.go similarity index 85% rename from rpc/core/dev.go rename to internal/rpc/core/dev.go index 0e365cdcc..fde7aef99 100644 --- a/rpc/core/dev.go +++ b/internal/rpc/core/dev.go @@ -1,7 +1,7 @@ package core import ( - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/core/doc.go b/internal/rpc/core/doc.go similarity index 100% rename from rpc/core/doc.go rename to internal/rpc/core/doc.go diff --git a/rpc/core/doc_template.txt b/internal/rpc/core/doc_template.txt similarity index 100% rename from rpc/core/doc_template.txt rename to internal/rpc/core/doc_template.txt diff --git a/rpc/core/env.go b/internal/rpc/core/env.go similarity index 96% rename from rpc/core/env.go rename to internal/rpc/core/env.go index 9aaa499a2..44264e949 100644 --- a/rpc/core/env.go +++ b/internal/rpc/core/env.go @@ -11,12 +11,12 @@ import ( mempl "github.com/tendermint/tendermint/internal/mempool" "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/internal/statesync" tmjson "github.com/tendermint/tendermint/libs/json" "github.com/tendermint/tendermint/libs/log" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/env_test.go b/internal/rpc/core/env_test.go similarity index 100% rename from rpc/core/env_test.go rename to internal/rpc/core/env_test.go diff --git a/rpc/core/events.go b/internal/rpc/core/events.go similarity index 98% rename from rpc/core/events.go rename to internal/rpc/core/events.go index e56295c52..d26a4d90f 100644 --- a/rpc/core/events.go +++ b/internal/rpc/core/events.go @@ -7,7 +7,7 @@ import ( tmpubsub "github.com/tendermint/tendermint/libs/pubsub" tmquery "github.com/tendermint/tendermint/libs/pubsub/query" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/core/evidence.go b/internal/rpc/core/evidence.go similarity index 93% rename from rpc/core/evidence.go rename to internal/rpc/core/evidence.go index e071c5a7e..311180bdd 100644 --- a/rpc/core/evidence.go +++ b/internal/rpc/core/evidence.go @@ -3,7 +3,7 @@ package core import ( "fmt" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/health.go b/internal/rpc/core/health.go similarity index 86% rename from rpc/core/health.go rename to internal/rpc/core/health.go index 855911d83..fa92d57ab 100644 --- a/rpc/core/health.go +++ b/internal/rpc/core/health.go @@ -1,7 +1,7 @@ package core import ( - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/core/mempool.go b/internal/rpc/core/mempool.go similarity index 99% rename from rpc/core/mempool.go rename to internal/rpc/core/mempool.go index 690b0a295..b44b9fb33 100644 --- a/rpc/core/mempool.go +++ b/internal/rpc/core/mempool.go @@ -9,7 +9,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" mempl "github.com/tendermint/tendermint/internal/mempool" tmpubsub "github.com/tendermint/tendermint/libs/pubsub" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/net.go b/internal/rpc/core/net.go similarity index 98% rename from rpc/core/net.go rename to internal/rpc/core/net.go index 5b1672e26..633359449 100644 --- a/rpc/core/net.go +++ b/internal/rpc/core/net.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/tendermint/tendermint/internal/p2p" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/core/net_test.go b/internal/rpc/core/net_test.go similarity index 100% rename from rpc/core/net_test.go rename to internal/rpc/core/net_test.go diff --git a/rpc/core/routes.go b/internal/rpc/core/routes.go similarity index 100% rename from rpc/core/routes.go rename to internal/rpc/core/routes.go diff --git a/rpc/core/status.go b/internal/rpc/core/status.go similarity index 98% rename from rpc/core/status.go rename to internal/rpc/core/status.go index c5a412369..567d73be4 100644 --- a/rpc/core/status.go +++ b/internal/rpc/core/status.go @@ -5,7 +5,7 @@ import ( "time" tmbytes "github.com/tendermint/tendermint/libs/bytes" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/tx.go b/internal/rpc/core/tx.go similarity index 97% rename from rpc/core/tx.go rename to internal/rpc/core/tx.go index eb6c73858..75a537942 100644 --- a/rpc/core/tx.go +++ b/internal/rpc/core/tx.go @@ -5,12 +5,12 @@ import ( "fmt" "sort" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/bytes" tmmath "github.com/tendermint/tendermint/libs/math" tmquery "github.com/tendermint/tendermint/libs/pubsub/query" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/errors.go b/internal/state/errors.go similarity index 100% rename from state/errors.go rename to internal/state/errors.go diff --git a/state/execution.go b/internal/state/execution.go similarity index 100% rename from state/execution.go rename to internal/state/execution.go diff --git a/state/execution_test.go b/internal/state/execution_test.go similarity index 98% rename from state/execution_test.go rename to internal/state/execution_test.go index e4d78e1b7..69085694b 100644 --- a/state/execution_test.go +++ b/internal/state/execution_test.go @@ -17,11 +17,11 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" mmock "github.com/tendermint/tendermint/internal/mempool/mock" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/mocks" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/libs/log" tmtime "github.com/tendermint/tendermint/libs/time" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/mocks" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/version" diff --git a/state/export_test.go b/internal/state/export_test.go similarity index 100% rename from state/export_test.go rename to internal/state/export_test.go diff --git a/state/helpers_test.go b/internal/state/helpers_test.go similarity index 98% rename from state/helpers_test.go rename to internal/state/helpers_test.go index 3590e642d..f20475633 100644 --- a/state/helpers_test.go +++ b/internal/state/helpers_test.go @@ -13,13 +13,13 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test/factory" tmrand "github.com/tendermint/tendermint/libs/rand" tmtime "github.com/tendermint/tendermint/libs/time" tmstate "github.com/tendermint/tendermint/proto/tendermint/state" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/block/kv/kv.go b/internal/state/indexer/block/kv/kv.go similarity index 99% rename from state/indexer/block/kv/kv.go rename to internal/state/indexer/block/kv/kv.go index bc90eadf5..d52f06c96 100644 --- a/state/indexer/block/kv/kv.go +++ b/internal/state/indexer/block/kv/kv.go @@ -12,8 +12,8 @@ import ( dbm "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/block/kv/kv_test.go b/internal/state/indexer/block/kv/kv_test.go similarity index 97% rename from state/indexer/block/kv/kv_test.go rename to internal/state/indexer/block/kv/kv_test.go index 2a342f870..2601c878b 100644 --- a/state/indexer/block/kv/kv_test.go +++ b/internal/state/indexer/block/kv/kv_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" + blockidxkv "github.com/tendermint/tendermint/internal/state/indexer/block/kv" "github.com/tendermint/tendermint/libs/pubsub/query" - blockidxkv "github.com/tendermint/tendermint/state/indexer/block/kv" "github.com/tendermint/tendermint/types" db "github.com/tendermint/tm-db" ) diff --git a/state/indexer/block/kv/util.go b/internal/state/indexer/block/kv/util.go similarity index 100% rename from state/indexer/block/kv/util.go rename to internal/state/indexer/block/kv/util.go diff --git a/state/indexer/block/null/null.go b/internal/state/indexer/block/null/null.go similarity index 91% rename from state/indexer/block/null/null.go rename to internal/state/indexer/block/null/null.go index d36d8680e..9b28d93bb 100644 --- a/state/indexer/block/null/null.go +++ b/internal/state/indexer/block/null/null.go @@ -4,8 +4,8 @@ import ( "context" "errors" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/doc.go b/internal/state/indexer/doc.go similarity index 100% rename from state/indexer/doc.go rename to internal/state/indexer/doc.go diff --git a/state/indexer/eventsink.go b/internal/state/indexer/eventsink.go similarity index 100% rename from state/indexer/eventsink.go rename to internal/state/indexer/eventsink.go diff --git a/state/indexer/indexer.go b/internal/state/indexer/indexer.go similarity index 100% rename from state/indexer/indexer.go rename to internal/state/indexer/indexer.go diff --git a/state/indexer/indexer_service.go b/internal/state/indexer/indexer_service.go similarity index 100% rename from state/indexer/indexer_service.go rename to internal/state/indexer/indexer_service.go diff --git a/state/indexer/indexer_service_test.go b/internal/state/indexer/indexer_service_test.go similarity index 95% rename from state/indexer/indexer_service_test.go rename to internal/state/indexer/indexer_service_test.go index 4d12cc86f..e630b07e9 100644 --- a/state/indexer/indexer_service_test.go +++ b/internal/state/indexer/indexer_service_test.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" + indexer "github.com/tendermint/tendermint/internal/state/indexer" + kv "github.com/tendermint/tendermint/internal/state/indexer/sink/kv" + psql "github.com/tendermint/tendermint/internal/state/indexer/sink/psql" tmlog "github.com/tendermint/tendermint/libs/log" - indexer "github.com/tendermint/tendermint/state/indexer" - kv "github.com/tendermint/tendermint/state/indexer/sink/kv" - psql "github.com/tendermint/tendermint/state/indexer/sink/psql" "github.com/tendermint/tendermint/types" db "github.com/tendermint/tm-db" ) diff --git a/state/indexer/mocks/event_sink.go b/internal/state/indexer/mocks/event_sink.go similarity index 98% rename from state/indexer/mocks/event_sink.go rename to internal/state/indexer/mocks/event_sink.go index ce5b8ace5..98b32e935 100644 --- a/state/indexer/mocks/event_sink.go +++ b/internal/state/indexer/mocks/event_sink.go @@ -6,7 +6,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - indexer "github.com/tendermint/tendermint/state/indexer" + indexer "github.com/tendermint/tendermint/internal/state/indexer" query "github.com/tendermint/tendermint/libs/pubsub/query" diff --git a/state/indexer/query_range.go b/internal/state/indexer/query_range.go similarity index 100% rename from state/indexer/query_range.go rename to internal/state/indexer/query_range.go diff --git a/state/indexer/sink/kv/kv.go b/internal/state/indexer/sink/kv/kv.go similarity index 87% rename from state/indexer/sink/kv/kv.go rename to internal/state/indexer/sink/kv/kv.go index 7d51640d8..eda8da846 100644 --- a/state/indexer/sink/kv/kv.go +++ b/internal/state/indexer/sink/kv/kv.go @@ -4,10 +4,10 @@ import ( "context" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/internal/state/indexer" + kvb "github.com/tendermint/tendermint/internal/state/indexer/block/kv" + kvt "github.com/tendermint/tendermint/internal/state/indexer/tx/kv" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - kvb "github.com/tendermint/tendermint/state/indexer/block/kv" - kvt "github.com/tendermint/tendermint/state/indexer/tx/kv" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" ) diff --git a/state/indexer/sink/kv/kv_test.go b/internal/state/indexer/sink/kv/kv_test.go similarity index 98% rename from state/indexer/sink/kv/kv_test.go rename to internal/state/indexer/sink/kv/kv_test.go index a5d2dd81e..d59f4ea90 100644 --- a/state/indexer/sink/kv/kv_test.go +++ b/internal/state/indexer/sink/kv/kv_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/internal/state/indexer" + kvtx "github.com/tendermint/tendermint/internal/state/indexer/tx/kv" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - kvtx "github.com/tendermint/tendermint/state/indexer/tx/kv" "github.com/tendermint/tendermint/types" db "github.com/tendermint/tm-db" ) diff --git a/state/indexer/sink/null/null.go b/internal/state/indexer/sink/null/null.go similarity index 94% rename from state/indexer/sink/null/null.go rename to internal/state/indexer/sink/null/null.go index b5ad93ab4..f58142f21 100644 --- a/state/indexer/sink/null/null.go +++ b/internal/state/indexer/sink/null/null.go @@ -4,8 +4,8 @@ import ( "context" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/sink/null/null_test.go b/internal/state/indexer/sink/null/null_test.go similarity index 93% rename from state/indexer/sink/null/null_test.go rename to internal/state/indexer/sink/null/null_test.go index eef63fd6e..15b77dc55 100644 --- a/state/indexer/sink/null/null_test.go +++ b/internal/state/indexer/sink/null/null_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/state/indexer" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/sink/psql/psql.go b/internal/state/indexer/sink/psql/psql.go similarity index 99% rename from state/indexer/sink/psql/psql.go rename to internal/state/indexer/sink/psql/psql.go index e452ed406..4db6f4435 100644 --- a/state/indexer/sink/psql/psql.go +++ b/internal/state/indexer/sink/psql/psql.go @@ -11,8 +11,8 @@ import ( "github.com/gogo/protobuf/proto" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/sink/psql/psql_test.go b/internal/state/indexer/sink/psql/psql_test.go similarity index 99% rename from state/indexer/sink/psql/psql_test.go rename to internal/state/indexer/sink/psql/psql_test.go index e8a1ce833..f19bbfba7 100644 --- a/state/indexer/sink/psql/psql_test.go +++ b/internal/state/indexer/sink/psql/psql_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/state/indexer" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/types" // Register the Postgres database driver. diff --git a/state/indexer/sink/psql/schema.sql b/internal/state/indexer/sink/psql/schema.sql similarity index 100% rename from state/indexer/sink/psql/schema.sql rename to internal/state/indexer/sink/psql/schema.sql diff --git a/state/indexer/sink/sink.go b/internal/state/indexer/sink/sink.go similarity index 85% rename from state/indexer/sink/sink.go rename to internal/state/indexer/sink/sink.go index f9dfa54df..b4c41ec31 100644 --- a/state/indexer/sink/sink.go +++ b/internal/state/indexer/sink/sink.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/indexer/sink/kv" - "github.com/tendermint/tendermint/state/indexer/sink/null" - "github.com/tendermint/tendermint/state/indexer/sink/psql" + "github.com/tendermint/tendermint/internal/state/indexer" + "github.com/tendermint/tendermint/internal/state/indexer/sink/kv" + "github.com/tendermint/tendermint/internal/state/indexer/sink/null" + "github.com/tendermint/tendermint/internal/state/indexer/sink/psql" ) // EventSinksFromConfig constructs a slice of indexer.EventSink using the provided diff --git a/state/indexer/tx/kv/kv.go b/internal/state/indexer/tx/kv/kv.go similarity index 99% rename from state/indexer/tx/kv/kv.go rename to internal/state/indexer/tx/kv/kv.go index 080dbce2c..f0550f8f3 100644 --- a/state/indexer/tx/kv/kv.go +++ b/internal/state/indexer/tx/kv/kv.go @@ -12,8 +12,8 @@ import ( dbm "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" + indexer "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" - indexer "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/tx/kv/kv_bench_test.go b/internal/state/indexer/tx/kv/kv_bench_test.go similarity index 100% rename from state/indexer/tx/kv/kv_bench_test.go rename to internal/state/indexer/tx/kv/kv_bench_test.go diff --git a/state/indexer/tx/kv/kv_test.go b/internal/state/indexer/tx/kv/kv_test.go similarity index 99% rename from state/indexer/tx/kv/kv_test.go rename to internal/state/indexer/tx/kv/kv_test.go index dd63dd9a4..064421f5f 100644 --- a/state/indexer/tx/kv/kv_test.go +++ b/internal/state/indexer/tx/kv/kv_test.go @@ -14,9 +14,9 @@ import ( db "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" + indexer "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" tmrand "github.com/tendermint/tendermint/libs/rand" - indexer "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/types" ) diff --git a/state/indexer/tx/kv/utils.go b/internal/state/indexer/tx/kv/utils.go similarity index 100% rename from state/indexer/tx/kv/utils.go rename to internal/state/indexer/tx/kv/utils.go diff --git a/state/indexer/tx/kv/utils_test.go b/internal/state/indexer/tx/kv/utils_test.go similarity index 100% rename from state/indexer/tx/kv/utils_test.go rename to internal/state/indexer/tx/kv/utils_test.go diff --git a/state/indexer/tx/null/null.go b/internal/state/indexer/tx/null/null.go similarity index 93% rename from state/indexer/tx/null/null.go rename to internal/state/indexer/tx/null/null.go index d92ed489e..0da7fc683 100644 --- a/state/indexer/tx/null/null.go +++ b/internal/state/indexer/tx/null/null.go @@ -5,8 +5,8 @@ import ( "errors" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" ) var _ indexer.TxIndexer = (*TxIndex)(nil) diff --git a/state/metrics.go b/internal/state/metrics.go similarity index 100% rename from state/metrics.go rename to internal/state/metrics.go diff --git a/state/mocks/block_store.go b/internal/state/mocks/block_store.go similarity index 100% rename from state/mocks/block_store.go rename to internal/state/mocks/block_store.go diff --git a/state/mocks/event_sink.go b/internal/state/mocks/event_sink.go similarity index 98% rename from state/mocks/event_sink.go rename to internal/state/mocks/event_sink.go index 749515ccf..b8a8fc464 100644 --- a/state/mocks/event_sink.go +++ b/internal/state/mocks/event_sink.go @@ -6,7 +6,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - indexer "github.com/tendermint/tendermint/state/indexer" + indexer "github.com/tendermint/tendermint/internal/state/indexer" query "github.com/tendermint/tendermint/libs/pubsub/query" diff --git a/state/mocks/evidence_pool.go b/internal/state/mocks/evidence_pool.go similarity index 96% rename from state/mocks/evidence_pool.go rename to internal/state/mocks/evidence_pool.go index bb33547d2..9f5e747e5 100644 --- a/state/mocks/evidence_pool.go +++ b/internal/state/mocks/evidence_pool.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/tendermint/tendermint/internal/state" types "github.com/tendermint/tendermint/types" ) diff --git a/state/mocks/store.go b/internal/state/mocks/store.go similarity index 98% rename from state/mocks/store.go rename to internal/state/mocks/store.go index 750bf7f29..af2408dd9 100644 --- a/state/mocks/store.go +++ b/internal/state/mocks/store.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/tendermint/tendermint/internal/state" tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state" diff --git a/state/services.go b/internal/state/services.go similarity index 100% rename from state/services.go rename to internal/state/services.go diff --git a/state/state.go b/internal/state/state.go similarity index 100% rename from state/state.go rename to internal/state/state.go diff --git a/state/state_test.go b/internal/state/state_test.go similarity index 99% rename from state/state_test.go rename to internal/state/state_test.go index 99d45bb62..102b206c2 100644 --- a/state/state_test.go +++ b/internal/state/state_test.go @@ -19,9 +19,9 @@ import ( cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto/ed25519" cryptoenc "github.com/tendermint/tendermint/crypto/encoding" + sm "github.com/tendermint/tendermint/internal/state" + sf "github.com/tendermint/tendermint/internal/state/test/factory" tmstate "github.com/tendermint/tendermint/proto/tendermint/state" - sm "github.com/tendermint/tendermint/state" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/types" ) diff --git a/state/store.go b/internal/state/store.go similarity index 100% rename from state/store.go rename to internal/state/store.go diff --git a/state/store_test.go b/internal/state/store_test.go similarity index 99% rename from state/store_test.go rename to internal/state/store_test.go index 5d32040b5..939878d40 100644 --- a/state/store_test.go +++ b/internal/state/store_test.go @@ -14,10 +14,10 @@ import ( cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/internal/test/factory" tmrand "github.com/tendermint/tendermint/libs/rand" tmstate "github.com/tendermint/tendermint/proto/tendermint/state" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/state/test/factory/block.go b/internal/state/test/factory/block.go similarity index 96% rename from state/test/factory/block.go rename to internal/state/test/factory/block.go index b4eb83fa7..dfcf5ebd9 100644 --- a/state/test/factory/block.go +++ b/internal/state/test/factory/block.go @@ -3,8 +3,8 @@ package factory import ( "time" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/internal/test/factory" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/state/time.go b/internal/state/time.go similarity index 100% rename from state/time.go rename to internal/state/time.go diff --git a/state/time_test.go b/internal/state/time_test.go similarity index 100% rename from state/time_test.go rename to internal/state/time_test.go diff --git a/state/tx_filter.go b/internal/state/tx_filter.go similarity index 100% rename from state/tx_filter.go rename to internal/state/tx_filter.go diff --git a/state/tx_filter_test.go b/internal/state/tx_filter_test.go similarity index 94% rename from state/tx_filter_test.go rename to internal/state/tx_filter_test.go index d6236fcbf..27af28a40 100644 --- a/state/tx_filter_test.go +++ b/internal/state/tx_filter_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + sm "github.com/tendermint/tendermint/internal/state" tmrand "github.com/tendermint/tendermint/libs/rand" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/state/validation.go b/internal/state/validation.go similarity index 100% rename from state/validation.go rename to internal/state/validation.go diff --git a/state/validation_test.go b/internal/state/validation_test.go similarity index 98% rename from state/validation_test.go rename to internal/state/validation_test.go index 151f2be61..328c67c08 100644 --- a/state/validation_test.go +++ b/internal/state/validation_test.go @@ -13,13 +13,13 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/tmhash" memmock "github.com/tendermint/tendermint/internal/mempool/mock" + sm "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/mocks" + sf "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" tmtime "github.com/tendermint/tendermint/libs/time" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/mocks" - sf "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tm-db" diff --git a/internal/statesync/mocks/state_provider.go b/internal/statesync/mocks/state_provider.go index 538c619fc..b8d681631 100644 --- a/internal/statesync/mocks/state_provider.go +++ b/internal/statesync/mocks/state_provider.go @@ -6,7 +6,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/tendermint/tendermint/internal/state" types "github.com/tendermint/tendermint/types" ) diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go index c2f598a8c..196ac1a9d 100644 --- a/internal/statesync/reactor.go +++ b/internal/statesync/reactor.go @@ -15,12 +15,12 @@ import ( tmsync "github.com/tendermint/tendermint/internal/libs/sync" "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/light" "github.com/tendermint/tendermint/light/provider" ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/statesync/reactor_test.go b/internal/statesync/reactor_test.go index 6ab41b36c..a0312428c 100644 --- a/internal/statesync/reactor_test.go +++ b/internal/statesync/reactor_test.go @@ -18,13 +18,13 @@ import ( "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/proxy" proxymocks "github.com/tendermint/tendermint/internal/proxy/mocks" + smmocks "github.com/tendermint/tendermint/internal/state/mocks" "github.com/tendermint/tendermint/internal/statesync/mocks" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/light/provider" ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - smmocks "github.com/tendermint/tendermint/state/mocks" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/internal/statesync/stateprovider.go b/internal/statesync/stateprovider.go index b58cb35de..9eb776e28 100644 --- a/internal/statesync/stateprovider.go +++ b/internal/statesync/stateprovider.go @@ -12,6 +12,7 @@ import ( tmsync "github.com/tendermint/tendermint/internal/libs/sync" "github.com/tendermint/tendermint/internal/p2p" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/light" lightprovider "github.com/tendermint/tendermint/light/provider" @@ -20,7 +21,6 @@ import ( lightdb "github.com/tendermint/tendermint/light/store/db" ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" rpchttp "github.com/tendermint/tendermint/rpc/client/http" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/version" ) diff --git a/internal/statesync/syncer.go b/internal/statesync/syncer.go index 05cfffe64..43fbf99e4 100644 --- a/internal/statesync/syncer.go +++ b/internal/statesync/syncer.go @@ -12,10 +12,10 @@ import ( tmsync "github.com/tendermint/tendermint/internal/libs/sync" "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/light" ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" ) diff --git a/internal/statesync/syncer_test.go b/internal/statesync/syncer_test.go index 867c99b0f..14297c049 100644 --- a/internal/statesync/syncer_test.go +++ b/internal/statesync/syncer_test.go @@ -15,9 +15,9 @@ import ( tmsync "github.com/tendermint/tendermint/internal/libs/sync" "github.com/tendermint/tendermint/internal/proxy" proxymocks "github.com/tendermint/tendermint/internal/proxy/mocks" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/internal/statesync/mocks" ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/version" ) diff --git a/light/provider/http/http.go b/light/provider/http/http.go index ceea0f6d2..810e43ece 100644 --- a/light/provider/http/http.go +++ b/light/provider/http/http.go @@ -12,7 +12,7 @@ import ( "github.com/tendermint/tendermint/light/provider" rpcclient "github.com/tendermint/tendermint/rpc/client" rpchttp "github.com/tendermint/tendermint/rpc/client/http" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/light/proxy/routes.go b/light/proxy/routes.go index 62d70f545..2fdc177dc 100644 --- a/light/proxy/routes.go +++ b/light/proxy/routes.go @@ -4,7 +4,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" lrpc "github.com/tendermint/tendermint/light/rpc" rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" diff --git a/light/rpc/client.go b/light/rpc/client.go index 84761fb04..16d5a5427 100644 --- a/light/rpc/client.go +++ b/light/rpc/client.go @@ -16,7 +16,7 @@ import ( tmmath "github.com/tendermint/tendermint/libs/math" service "github.com/tendermint/tendermint/libs/service" rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/node/node.go b/node/node.go index fa75a432d..c2bf88fde 100644 --- a/node/node.go +++ b/node/node.go @@ -23,6 +23,8 @@ import ( "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/p2p/pex" "github.com/tendermint/tendermint/internal/proxy" + rpccore "github.com/tendermint/tendermint/internal/rpc/core" + sm "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/internal/statesync" "github.com/tendermint/tendermint/libs/log" tmnet "github.com/tendermint/tendermint/libs/net" @@ -32,10 +34,8 @@ import ( tmtime "github.com/tendermint/tendermint/libs/time" "github.com/tendermint/tendermint/privval" tmgrpc "github.com/tendermint/tendermint/privval/grpc" - rpccore "github.com/tendermint/tendermint/rpc/core" grpccore "github.com/tendermint/tendermint/rpc/grpc" rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" - sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/node/node_test.go b/node/node_test.go index 7512c732f..aae7f8008 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -26,13 +26,13 @@ import ( "github.com/tendermint/tendermint/internal/mempool" mempoolv0 "github.com/tendermint/tendermint/internal/mempool/v0" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/indexer" "github.com/tendermint/tendermint/internal/test/factory" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" tmtime "github.com/tendermint/tendermint/libs/time" "github.com/tendermint/tendermint/privval" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" ) diff --git a/node/setup.go b/node/setup.go index a966da85c..6d403b0b0 100644 --- a/node/setup.go +++ b/node/setup.go @@ -26,14 +26,14 @@ import ( "github.com/tendermint/tendermint/internal/p2p" "github.com/tendermint/tendermint/internal/p2p/pex" "github.com/tendermint/tendermint/internal/proxy" + sm "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/indexer" + "github.com/tendermint/tendermint/internal/state/indexer/sink" "github.com/tendermint/tendermint/internal/statesync" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" tmstrings "github.com/tendermint/tendermint/libs/strings" protop2p "github.com/tendermint/tendermint/proto/tendermint/p2p" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/indexer/sink" "github.com/tendermint/tendermint/store" "github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/version" diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 85f38cada..ea827cc7a 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/state/types.proto +// source: tendermint/internal/state/types.proto package state @@ -419,7 +419,7 @@ func init() { proto.RegisterType((*State)(nil), "tendermint.state.State") } -func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) } +func init() { proto.RegisterFile("tendermint/internal/state/types.proto", fileDescriptor_ccfacf933f22bf93) } var fileDescriptor_ccfacf933f22bf93 = []byte{ // 763 bytes of a gzipped FileDescriptorProto diff --git a/proto/tendermint/statesync/types.pb.go b/proto/tendermint/statesync/types.pb.go index 5541c2803..c0fa0f3a7 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/tendermint/statesync/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/statesync/types.proto +// source: tendermint/internal/statesync/types.proto package statesync @@ -631,7 +631,7 @@ func init() { proto.RegisterType((*ParamsResponse)(nil), "tendermint.statesync.ParamsResponse") } -func init() { proto.RegisterFile("tendermint/statesync/types.proto", fileDescriptor_a1c2869546ca7914) } +func init() { proto.RegisterFile("tendermint/internal/statesync/types.proto", fileDescriptor_a1c2869546ca7914) } var fileDescriptor_a1c2869546ca7914 = []byte{ // 589 bytes of a gzipped FileDescriptorProto diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index 4acd0fee9..e5d2c35f3 100644 --- a/rpc/client/event_test.go +++ b/rpc/client/event_test.go @@ -13,7 +13,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmrand "github.com/tendermint/tendermint/libs/rand" "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/examples_test.go b/rpc/client/examples_test.go index 8c4c4f277..e241404f3 100644 --- a/rpc/client/examples_test.go +++ b/rpc/client/examples_test.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/abci/example/kvstore" rpchttp "github.com/tendermint/tendermint/rpc/client/http" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctest "github.com/tendermint/tendermint/rpc/test" ) diff --git a/rpc/client/helpers_test.go b/rpc/client/helpers_test.go index 3b78dfe5f..6d2c2883d 100644 --- a/rpc/client/helpers_test.go +++ b/rpc/client/helpers_test.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/rpc/client" "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" ) func TestWaitForHeight(t *testing.T) { diff --git a/rpc/client/http/http.go b/rpc/client/http/http.go index 26a0ea5de..b66d9634f 100644 --- a/rpc/client/http/http.go +++ b/rpc/client/http/http.go @@ -8,7 +8,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/log" rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" jsonrpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/http/ws.go b/rpc/client/http/ws.go index afdaec861..2e08257d5 100644 --- a/rpc/client/http/ws.go +++ b/rpc/client/http/ws.go @@ -12,7 +12,7 @@ import ( tmpubsub "github.com/tendermint/tendermint/libs/pubsub" "github.com/tendermint/tendermint/libs/service" rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" jsonrpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" ) diff --git a/rpc/client/interface.go b/rpc/client/interface.go index 8244e9295..f63161118 100644 --- a/rpc/client/interface.go +++ b/rpc/client/interface.go @@ -25,7 +25,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/service" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/local/local.go b/rpc/client/local/local.go index 39c4295ac..2080e0d44 100644 --- a/rpc/client/local/local.go +++ b/rpc/client/local/local.go @@ -6,13 +6,13 @@ import ( "fmt" "time" + rpccore "github.com/tendermint/tendermint/internal/rpc/core" "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/log" tmpubsub "github.com/tendermint/tendermint/libs/pubsub" tmquery "github.com/tendermint/tendermint/libs/pubsub/query" rpcclient "github.com/tendermint/tendermint/rpc/client" - rpccore "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go index 960ee6501..0186ee9cc 100644 --- a/rpc/client/mock/abci.go +++ b/rpc/client/mock/abci.go @@ -7,7 +7,7 @@ import ( "github.com/tendermint/tendermint/internal/proxy" "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/mock/abci_test.go b/rpc/client/mock/abci_test.go index d164b275a..206b8fac2 100644 --- a/rpc/client/mock/abci_test.go +++ b/rpc/client/mock/abci_test.go @@ -14,7 +14,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/rpc/client" "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/mock/client.go b/rpc/client/mock/client.go index 8ff474dd5..70003569d 100644 --- a/rpc/client/mock/client.go +++ b/rpc/client/mock/client.go @@ -18,11 +18,11 @@ import ( "context" "reflect" + "github.com/tendermint/tendermint/internal/rpc/core" "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/service" "github.com/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/client/mock/status.go b/rpc/client/mock/status.go index 6dd6a8d44..10da67008 100644 --- a/rpc/client/mock/status.go +++ b/rpc/client/mock/status.go @@ -4,7 +4,7 @@ import ( "context" "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" ) // 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 4f2f59f4c..37dce6095 100644 --- a/rpc/client/mock/status_test.go +++ b/rpc/client/mock/status_test.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" ) func TestStatus(t *testing.T) { diff --git a/rpc/client/mocks/client.go b/rpc/client/mocks/client.go index 8e4c7cbf5..3036c48f0 100644 --- a/rpc/client/mocks/client.go +++ b/rpc/client/mocks/client.go @@ -8,7 +8,7 @@ import ( context "context" - coretypes "github.com/tendermint/tendermint/rpc/core/types" + coretypes "github.com/tendermint/tendermint/rpc/coretypes" log "github.com/tendermint/tendermint/libs/log" diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index f8962fb35..5ad9e4244 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -24,7 +24,7 @@ import ( "github.com/tendermint/tendermint/rpc/client" rpchttp "github.com/tendermint/tendermint/rpc/client/http" rpclocal "github.com/tendermint/tendermint/rpc/client/local" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/core/types/responses.go b/rpc/coretypes/responses.go similarity index 100% rename from rpc/core/types/responses.go rename to rpc/coretypes/responses.go diff --git a/rpc/core/types/responses_test.go b/rpc/coretypes/responses_test.go similarity index 100% rename from rpc/core/types/responses_test.go rename to rpc/coretypes/responses_test.go diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go index 27f8c97e4..4db46bbe3 100644 --- a/rpc/grpc/api.go +++ b/rpc/grpc/api.go @@ -4,7 +4,7 @@ import ( "context" abci "github.com/tendermint/tendermint/abci/types" - core "github.com/tendermint/tendermint/rpc/core" + core "github.com/tendermint/tendermint/internal/rpc/core" rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/grpc/client_server.go b/rpc/grpc/client_server.go index 2fb0abb67..e5164dc64 100644 --- a/rpc/grpc/client_server.go +++ b/rpc/grpc/client_server.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc" + "github.com/tendermint/tendermint/internal/rpc/core" tmnet "github.com/tendermint/tendermint/libs/net" - "github.com/tendermint/tendermint/rpc/core" ) // Config is an gRPC server configuration. diff --git a/rpc/jsonrpc/server/http_json_handler.go b/rpc/jsonrpc/server/http_json_handler.go index bbb32b407..3e31d3ec1 100644 --- a/rpc/jsonrpc/server/http_json_handler.go +++ b/rpc/jsonrpc/server/http_json_handler.go @@ -12,7 +12,7 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" "github.com/tendermint/tendermint/libs/log" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/jsonrpc/server/http_uri_handler.go b/rpc/jsonrpc/server/http_uri_handler.go index f5a2ecebc..a07401578 100644 --- a/rpc/jsonrpc/server/http_uri_handler.go +++ b/rpc/jsonrpc/server/http_uri_handler.go @@ -11,7 +11,7 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" "github.com/tendermint/tendermint/libs/log" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" types "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/jsonrpc/server/ws_handler.go b/rpc/jsonrpc/server/ws_handler.go index a7b77dbd3..c6a8a99b8 100644 --- a/rpc/jsonrpc/server/ws_handler.go +++ b/rpc/jsonrpc/server/ws_handler.go @@ -14,7 +14,7 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" types "github.com/tendermint/tendermint/rpc/jsonrpc/types" ) diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go index 3a9a11108..91cff8386 100644 --- a/rpc/test/helpers.go +++ b/rpc/test/helpers.go @@ -13,7 +13,7 @@ import ( tmnet "github.com/tendermint/tendermint/libs/net" "github.com/tendermint/tendermint/libs/service" nm "github.com/tendermint/tendermint/node" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/coretypes" core_grpc "github.com/tendermint/tendermint/rpc/grpc" rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" ) diff --git a/store/store_test.go b/store/store_test.go index 2132d9aff..e00715eb7 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -14,11 +14,11 @@ import ( cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/crypto" + sm "github.com/tendermint/tendermint/internal/state" + "github.com/tendermint/tendermint/internal/state/test/factory" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" tmtime "github.com/tendermint/tendermint/libs/time" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/test/factory" "github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/version" ) diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go index 900f75d73..ccb3f6c51 100644 --- a/test/e2e/runner/perturb.go +++ b/test/e2e/runner/perturb.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - rpctypes "github.com/tendermint/tendermint/rpc/core/types" + rpctypes "github.com/tendermint/tendermint/rpc/coretypes" e2e "github.com/tendermint/tendermint/test/e2e/pkg" ) diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go index ca6b743eb..5cfa1d64d 100644 --- a/test/e2e/runner/rpc.go +++ b/test/e2e/runner/rpc.go @@ -7,7 +7,7 @@ import ( "time" rpchttp "github.com/tendermint/tendermint/rpc/client/http" - rpctypes "github.com/tendermint/tendermint/rpc/core/types" + rpctypes "github.com/tendermint/tendermint/rpc/coretypes" e2e "github.com/tendermint/tendermint/test/e2e/pkg" "github.com/tendermint/tendermint/types" ) diff --git a/test/e2e/tests/e2e_test.go b/test/e2e/tests/e2e_test.go index acc3ac78a..a645fd7c1 100644 --- a/test/e2e/tests/e2e_test.go +++ b/test/e2e/tests/e2e_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" rpchttp "github.com/tendermint/tendermint/rpc/client/http" - rpctypes "github.com/tendermint/tendermint/rpc/core/types" + rpctypes "github.com/tendermint/tendermint/rpc/coretypes" e2e "github.com/tendermint/tendermint/test/e2e/pkg" "github.com/tendermint/tendermint/types" ) diff --git a/tools/tm-signer-harness/internal/test_harness.go b/tools/tm-signer-harness/internal/test_harness.go index 4d333949a..96eaaaff0 100644 --- a/tools/tm-signer-harness/internal/test_harness.go +++ b/tools/tm-signer-harness/internal/test_harness.go @@ -12,8 +12,8 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/tendermint/tendermint/internal/state" "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/libs/log" tmnet "github.com/tendermint/tendermint/libs/net"