From 0017fb7ffe947ddbcd9eff0ffc5089600296b119 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Fri, 21 Apr 2017 17:38:40 -0400 Subject: [PATCH] premerge --- CHANGELOG.md => premerge/CHANGELOG.md | 0 CONTRIBUTING.md => premerge/CONTRIBUTING.md | 0 INSTALL.md => premerge/INSTALL.md | 0 LICENSE => premerge/LICENSE | 0 Makefile => premerge/Makefile | 0 README.md => premerge/README.md | 0 Vagrantfile => premerge/Vagrantfile | 0 circle.yml => premerge/circle.yml | 0 glide.lock => premerge/glide.lock | 0 glide.yaml => premerge/glide.yaml | 0 {test => premerge/test}/README.md | 0 {test => premerge/test}/app/clean.sh | 0 {test => premerge/test}/app/counter_test.sh | 0 {test => premerge/test}/app/dummy_test.sh | 0 {test => premerge/test}/app/grpc_client.go | 0 {test => premerge/test}/app/test.sh | 0 {test => premerge/test}/docker/Dockerfile | 0 {test => premerge/test}/docker/build.sh | 0 {test => premerge/test}/docker/update.sh | 0 {test => premerge/test}/net/setup.sh | 0 {test => premerge/test}/net/start.sh | 0 {test => premerge/test}/net/test.sh | 0 {test => premerge/test}/p2p/README.md | 0 {test => premerge/test}/p2p/atomic_broadcast/test.sh | 0 {test => premerge/test}/p2p/basic/test.sh | 0 {test => premerge/test}/p2p/clean.sh | 0 {test => premerge/test}/p2p/client.sh | 0 {test => premerge/test}/p2p/data/app/init.sh | 0 {test => premerge/test}/p2p/data/chain_config.json | 0 {test => premerge/test}/p2p/data/core/init.sh | 0 {test => premerge/test}/p2p/data/data/init.sh | 0 {test => premerge/test}/p2p/data/mach1/core/genesis.json | 0 {test => premerge/test}/p2p/data/mach1/core/priv_validator.json | 0 {test => premerge/test}/p2p/data/mach2/core/genesis.json | 0 {test => premerge/test}/p2p/data/mach2/core/priv_validator.json | 0 {test => premerge/test}/p2p/data/mach3/core/genesis.json | 0 {test => premerge/test}/p2p/data/mach3/core/priv_validator.json | 0 {test => premerge/test}/p2p/data/mach4/core/genesis.json | 0 {test => premerge/test}/p2p/data/mach4/core/priv_validator.json | 0 {test => premerge/test}/p2p/fast_sync/check_peer.sh | 0 {test => premerge/test}/p2p/fast_sync/test.sh | 0 {test => premerge/test}/p2p/fast_sync/test_peer.sh | 0 {test => premerge/test}/p2p/ip.sh | 0 {test => premerge/test}/p2p/kill_all/check_peers.sh | 0 {test => premerge/test}/p2p/kill_all/test.sh | 0 {test => premerge/test}/p2p/local_testnet_start.sh | 0 {test => premerge/test}/p2p/local_testnet_stop.sh | 0 {test => premerge/test}/p2p/peer.sh | 0 {test => premerge/test}/p2p/pex/check_peer.sh | 0 {test => premerge/test}/p2p/pex/dial_seeds.sh | 0 {test => premerge/test}/p2p/pex/test.sh | 0 {test => premerge/test}/p2p/pex/test_addrbook.sh | 0 {test => premerge/test}/p2p/pex/test_dial_seeds.sh | 0 {test => premerge/test}/p2p/seeds.sh | 0 {test => premerge/test}/p2p/test.sh | 0 {test => premerge/test}/persist/test.sh | 0 {test => premerge/test}/persist/test_failure_indices.sh | 0 {test => premerge/test}/persist/test_simple.sh | 0 {test => premerge/test}/run_test.sh | 0 {test => premerge/test}/test.sh | 0 {test => premerge/test}/test_cover.sh | 0 {test => premerge/test}/test_libs.sh | 0 {test => premerge/test}/utils/txs.sh | 0 {types => premerge/types}/block.go | 0 {types => premerge/types}/block_meta.go | 0 {types => premerge/types}/canonical_json.go | 0 {types => premerge/types}/events.go | 0 {types => premerge/types}/genesis.go | 0 {types => premerge/types}/keys.go | 0 {types => premerge/types}/log.go | 0 {types => premerge/types}/part_set.go | 0 {types => premerge/types}/part_set_test.go | 0 {types => premerge/types}/priv_validator.go | 0 {types => premerge/types}/priv_validator_test.go | 0 {types => premerge/types}/proposal.go | 0 {types => premerge/types}/proposal_test.go | 0 {types => premerge/types}/protobuf.go | 0 {types => premerge/types}/services.go | 0 {types => premerge/types}/signable.go | 0 {types => premerge/types}/tx.go | 0 {types => premerge/types}/tx_test.go | 0 {types => premerge/types}/validator.go | 0 {types => premerge/types}/validator_set.go | 0 {types => premerge/types}/validator_set_test.go | 0 {types => premerge/types}/vote.go | 0 {types => premerge/types}/vote_set.go | 0 {types => premerge/types}/vote_set_test.go | 0 {types => premerge/types}/vote_test.go | 0 88 files changed, 0 insertions(+), 0 deletions(-) rename CHANGELOG.md => premerge/CHANGELOG.md (100%) rename CONTRIBUTING.md => premerge/CONTRIBUTING.md (100%) rename INSTALL.md => premerge/INSTALL.md (100%) rename LICENSE => premerge/LICENSE (100%) rename Makefile => premerge/Makefile (100%) rename README.md => premerge/README.md (100%) rename Vagrantfile => premerge/Vagrantfile (100%) rename circle.yml => premerge/circle.yml (100%) rename glide.lock => premerge/glide.lock (100%) rename glide.yaml => premerge/glide.yaml (100%) rename {test => premerge/test}/README.md (100%) rename {test => premerge/test}/app/clean.sh (100%) rename {test => premerge/test}/app/counter_test.sh (100%) rename {test => premerge/test}/app/dummy_test.sh (100%) rename {test => premerge/test}/app/grpc_client.go (100%) rename {test => premerge/test}/app/test.sh (100%) rename {test => premerge/test}/docker/Dockerfile (100%) rename {test => premerge/test}/docker/build.sh (100%) rename {test => premerge/test}/docker/update.sh (100%) rename {test => premerge/test}/net/setup.sh (100%) rename {test => premerge/test}/net/start.sh (100%) rename {test => premerge/test}/net/test.sh (100%) rename {test => premerge/test}/p2p/README.md (100%) rename {test => premerge/test}/p2p/atomic_broadcast/test.sh (100%) rename {test => premerge/test}/p2p/basic/test.sh (100%) rename {test => premerge/test}/p2p/clean.sh (100%) rename {test => premerge/test}/p2p/client.sh (100%) rename {test => premerge/test}/p2p/data/app/init.sh (100%) rename {test => premerge/test}/p2p/data/chain_config.json (100%) rename {test => premerge/test}/p2p/data/core/init.sh (100%) rename {test => premerge/test}/p2p/data/data/init.sh (100%) rename {test => premerge/test}/p2p/data/mach1/core/genesis.json (100%) rename {test => premerge/test}/p2p/data/mach1/core/priv_validator.json (100%) rename {test => premerge/test}/p2p/data/mach2/core/genesis.json (100%) rename {test => premerge/test}/p2p/data/mach2/core/priv_validator.json (100%) rename {test => premerge/test}/p2p/data/mach3/core/genesis.json (100%) rename {test => premerge/test}/p2p/data/mach3/core/priv_validator.json (100%) rename {test => premerge/test}/p2p/data/mach4/core/genesis.json (100%) rename {test => premerge/test}/p2p/data/mach4/core/priv_validator.json (100%) rename {test => premerge/test}/p2p/fast_sync/check_peer.sh (100%) rename {test => premerge/test}/p2p/fast_sync/test.sh (100%) rename {test => premerge/test}/p2p/fast_sync/test_peer.sh (100%) rename {test => premerge/test}/p2p/ip.sh (100%) rename {test => premerge/test}/p2p/kill_all/check_peers.sh (100%) rename {test => premerge/test}/p2p/kill_all/test.sh (100%) rename {test => premerge/test}/p2p/local_testnet_start.sh (100%) rename {test => premerge/test}/p2p/local_testnet_stop.sh (100%) rename {test => premerge/test}/p2p/peer.sh (100%) rename {test => premerge/test}/p2p/pex/check_peer.sh (100%) rename {test => premerge/test}/p2p/pex/dial_seeds.sh (100%) rename {test => premerge/test}/p2p/pex/test.sh (100%) rename {test => premerge/test}/p2p/pex/test_addrbook.sh (100%) rename {test => premerge/test}/p2p/pex/test_dial_seeds.sh (100%) rename {test => premerge/test}/p2p/seeds.sh (100%) rename {test => premerge/test}/p2p/test.sh (100%) rename {test => premerge/test}/persist/test.sh (100%) rename {test => premerge/test}/persist/test_failure_indices.sh (100%) rename {test => premerge/test}/persist/test_simple.sh (100%) rename {test => premerge/test}/run_test.sh (100%) rename {test => premerge/test}/test.sh (100%) rename {test => premerge/test}/test_cover.sh (100%) rename {test => premerge/test}/test_libs.sh (100%) rename {test => premerge/test}/utils/txs.sh (100%) rename {types => premerge/types}/block.go (100%) rename {types => premerge/types}/block_meta.go (100%) rename {types => premerge/types}/canonical_json.go (100%) rename {types => premerge/types}/events.go (100%) rename {types => premerge/types}/genesis.go (100%) rename {types => premerge/types}/keys.go (100%) rename {types => premerge/types}/log.go (100%) rename {types => premerge/types}/part_set.go (100%) rename {types => premerge/types}/part_set_test.go (100%) rename {types => premerge/types}/priv_validator.go (100%) rename {types => premerge/types}/priv_validator_test.go (100%) rename {types => premerge/types}/proposal.go (100%) rename {types => premerge/types}/proposal_test.go (100%) rename {types => premerge/types}/protobuf.go (100%) rename {types => premerge/types}/services.go (100%) rename {types => premerge/types}/signable.go (100%) rename {types => premerge/types}/tx.go (100%) rename {types => premerge/types}/tx_test.go (100%) rename {types => premerge/types}/validator.go (100%) rename {types => premerge/types}/validator_set.go (100%) rename {types => premerge/types}/validator_set_test.go (100%) rename {types => premerge/types}/vote.go (100%) rename {types => premerge/types}/vote_set.go (100%) rename {types => premerge/types}/vote_set_test.go (100%) rename {types => premerge/types}/vote_test.go (100%) diff --git a/CHANGELOG.md b/premerge/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to premerge/CHANGELOG.md diff --git a/CONTRIBUTING.md b/premerge/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to premerge/CONTRIBUTING.md diff --git a/INSTALL.md b/premerge/INSTALL.md similarity index 100% rename from INSTALL.md rename to premerge/INSTALL.md diff --git a/LICENSE b/premerge/LICENSE similarity index 100% rename from LICENSE rename to premerge/LICENSE diff --git a/Makefile b/premerge/Makefile similarity index 100% rename from Makefile rename to premerge/Makefile diff --git a/README.md b/premerge/README.md similarity index 100% rename from README.md rename to premerge/README.md diff --git a/Vagrantfile b/premerge/Vagrantfile similarity index 100% rename from Vagrantfile rename to premerge/Vagrantfile diff --git a/circle.yml b/premerge/circle.yml similarity index 100% rename from circle.yml rename to premerge/circle.yml diff --git a/glide.lock b/premerge/glide.lock similarity index 100% rename from glide.lock rename to premerge/glide.lock diff --git a/glide.yaml b/premerge/glide.yaml similarity index 100% rename from glide.yaml rename to premerge/glide.yaml diff --git a/test/README.md b/premerge/test/README.md similarity index 100% rename from test/README.md rename to premerge/test/README.md diff --git a/test/app/clean.sh b/premerge/test/app/clean.sh similarity index 100% rename from test/app/clean.sh rename to premerge/test/app/clean.sh diff --git a/test/app/counter_test.sh b/premerge/test/app/counter_test.sh similarity index 100% rename from test/app/counter_test.sh rename to premerge/test/app/counter_test.sh diff --git a/test/app/dummy_test.sh b/premerge/test/app/dummy_test.sh similarity index 100% rename from test/app/dummy_test.sh rename to premerge/test/app/dummy_test.sh diff --git a/test/app/grpc_client.go b/premerge/test/app/grpc_client.go similarity index 100% rename from test/app/grpc_client.go rename to premerge/test/app/grpc_client.go diff --git a/test/app/test.sh b/premerge/test/app/test.sh similarity index 100% rename from test/app/test.sh rename to premerge/test/app/test.sh diff --git a/test/docker/Dockerfile b/premerge/test/docker/Dockerfile similarity index 100% rename from test/docker/Dockerfile rename to premerge/test/docker/Dockerfile diff --git a/test/docker/build.sh b/premerge/test/docker/build.sh similarity index 100% rename from test/docker/build.sh rename to premerge/test/docker/build.sh diff --git a/test/docker/update.sh b/premerge/test/docker/update.sh similarity index 100% rename from test/docker/update.sh rename to premerge/test/docker/update.sh diff --git a/test/net/setup.sh b/premerge/test/net/setup.sh similarity index 100% rename from test/net/setup.sh rename to premerge/test/net/setup.sh diff --git a/test/net/start.sh b/premerge/test/net/start.sh similarity index 100% rename from test/net/start.sh rename to premerge/test/net/start.sh diff --git a/test/net/test.sh b/premerge/test/net/test.sh similarity index 100% rename from test/net/test.sh rename to premerge/test/net/test.sh diff --git a/test/p2p/README.md b/premerge/test/p2p/README.md similarity index 100% rename from test/p2p/README.md rename to premerge/test/p2p/README.md diff --git a/test/p2p/atomic_broadcast/test.sh b/premerge/test/p2p/atomic_broadcast/test.sh similarity index 100% rename from test/p2p/atomic_broadcast/test.sh rename to premerge/test/p2p/atomic_broadcast/test.sh diff --git a/test/p2p/basic/test.sh b/premerge/test/p2p/basic/test.sh similarity index 100% rename from test/p2p/basic/test.sh rename to premerge/test/p2p/basic/test.sh diff --git a/test/p2p/clean.sh b/premerge/test/p2p/clean.sh similarity index 100% rename from test/p2p/clean.sh rename to premerge/test/p2p/clean.sh diff --git a/test/p2p/client.sh b/premerge/test/p2p/client.sh similarity index 100% rename from test/p2p/client.sh rename to premerge/test/p2p/client.sh diff --git a/test/p2p/data/app/init.sh b/premerge/test/p2p/data/app/init.sh similarity index 100% rename from test/p2p/data/app/init.sh rename to premerge/test/p2p/data/app/init.sh diff --git a/test/p2p/data/chain_config.json b/premerge/test/p2p/data/chain_config.json similarity index 100% rename from test/p2p/data/chain_config.json rename to premerge/test/p2p/data/chain_config.json diff --git a/test/p2p/data/core/init.sh b/premerge/test/p2p/data/core/init.sh similarity index 100% rename from test/p2p/data/core/init.sh rename to premerge/test/p2p/data/core/init.sh diff --git a/test/p2p/data/data/init.sh b/premerge/test/p2p/data/data/init.sh similarity index 100% rename from test/p2p/data/data/init.sh rename to premerge/test/p2p/data/data/init.sh diff --git a/test/p2p/data/mach1/core/genesis.json b/premerge/test/p2p/data/mach1/core/genesis.json similarity index 100% rename from test/p2p/data/mach1/core/genesis.json rename to premerge/test/p2p/data/mach1/core/genesis.json diff --git a/test/p2p/data/mach1/core/priv_validator.json b/premerge/test/p2p/data/mach1/core/priv_validator.json similarity index 100% rename from test/p2p/data/mach1/core/priv_validator.json rename to premerge/test/p2p/data/mach1/core/priv_validator.json diff --git a/test/p2p/data/mach2/core/genesis.json b/premerge/test/p2p/data/mach2/core/genesis.json similarity index 100% rename from test/p2p/data/mach2/core/genesis.json rename to premerge/test/p2p/data/mach2/core/genesis.json diff --git a/test/p2p/data/mach2/core/priv_validator.json b/premerge/test/p2p/data/mach2/core/priv_validator.json similarity index 100% rename from test/p2p/data/mach2/core/priv_validator.json rename to premerge/test/p2p/data/mach2/core/priv_validator.json diff --git a/test/p2p/data/mach3/core/genesis.json b/premerge/test/p2p/data/mach3/core/genesis.json similarity index 100% rename from test/p2p/data/mach3/core/genesis.json rename to premerge/test/p2p/data/mach3/core/genesis.json diff --git a/test/p2p/data/mach3/core/priv_validator.json b/premerge/test/p2p/data/mach3/core/priv_validator.json similarity index 100% rename from test/p2p/data/mach3/core/priv_validator.json rename to premerge/test/p2p/data/mach3/core/priv_validator.json diff --git a/test/p2p/data/mach4/core/genesis.json b/premerge/test/p2p/data/mach4/core/genesis.json similarity index 100% rename from test/p2p/data/mach4/core/genesis.json rename to premerge/test/p2p/data/mach4/core/genesis.json diff --git a/test/p2p/data/mach4/core/priv_validator.json b/premerge/test/p2p/data/mach4/core/priv_validator.json similarity index 100% rename from test/p2p/data/mach4/core/priv_validator.json rename to premerge/test/p2p/data/mach4/core/priv_validator.json diff --git a/test/p2p/fast_sync/check_peer.sh b/premerge/test/p2p/fast_sync/check_peer.sh similarity index 100% rename from test/p2p/fast_sync/check_peer.sh rename to premerge/test/p2p/fast_sync/check_peer.sh diff --git a/test/p2p/fast_sync/test.sh b/premerge/test/p2p/fast_sync/test.sh similarity index 100% rename from test/p2p/fast_sync/test.sh rename to premerge/test/p2p/fast_sync/test.sh diff --git a/test/p2p/fast_sync/test_peer.sh b/premerge/test/p2p/fast_sync/test_peer.sh similarity index 100% rename from test/p2p/fast_sync/test_peer.sh rename to premerge/test/p2p/fast_sync/test_peer.sh diff --git a/test/p2p/ip.sh b/premerge/test/p2p/ip.sh similarity index 100% rename from test/p2p/ip.sh rename to premerge/test/p2p/ip.sh diff --git a/test/p2p/kill_all/check_peers.sh b/premerge/test/p2p/kill_all/check_peers.sh similarity index 100% rename from test/p2p/kill_all/check_peers.sh rename to premerge/test/p2p/kill_all/check_peers.sh diff --git a/test/p2p/kill_all/test.sh b/premerge/test/p2p/kill_all/test.sh similarity index 100% rename from test/p2p/kill_all/test.sh rename to premerge/test/p2p/kill_all/test.sh diff --git a/test/p2p/local_testnet_start.sh b/premerge/test/p2p/local_testnet_start.sh similarity index 100% rename from test/p2p/local_testnet_start.sh rename to premerge/test/p2p/local_testnet_start.sh diff --git a/test/p2p/local_testnet_stop.sh b/premerge/test/p2p/local_testnet_stop.sh similarity index 100% rename from test/p2p/local_testnet_stop.sh rename to premerge/test/p2p/local_testnet_stop.sh diff --git a/test/p2p/peer.sh b/premerge/test/p2p/peer.sh similarity index 100% rename from test/p2p/peer.sh rename to premerge/test/p2p/peer.sh diff --git a/test/p2p/pex/check_peer.sh b/premerge/test/p2p/pex/check_peer.sh similarity index 100% rename from test/p2p/pex/check_peer.sh rename to premerge/test/p2p/pex/check_peer.sh diff --git a/test/p2p/pex/dial_seeds.sh b/premerge/test/p2p/pex/dial_seeds.sh similarity index 100% rename from test/p2p/pex/dial_seeds.sh rename to premerge/test/p2p/pex/dial_seeds.sh diff --git a/test/p2p/pex/test.sh b/premerge/test/p2p/pex/test.sh similarity index 100% rename from test/p2p/pex/test.sh rename to premerge/test/p2p/pex/test.sh diff --git a/test/p2p/pex/test_addrbook.sh b/premerge/test/p2p/pex/test_addrbook.sh similarity index 100% rename from test/p2p/pex/test_addrbook.sh rename to premerge/test/p2p/pex/test_addrbook.sh diff --git a/test/p2p/pex/test_dial_seeds.sh b/premerge/test/p2p/pex/test_dial_seeds.sh similarity index 100% rename from test/p2p/pex/test_dial_seeds.sh rename to premerge/test/p2p/pex/test_dial_seeds.sh diff --git a/test/p2p/seeds.sh b/premerge/test/p2p/seeds.sh similarity index 100% rename from test/p2p/seeds.sh rename to premerge/test/p2p/seeds.sh diff --git a/test/p2p/test.sh b/premerge/test/p2p/test.sh similarity index 100% rename from test/p2p/test.sh rename to premerge/test/p2p/test.sh diff --git a/test/persist/test.sh b/premerge/test/persist/test.sh similarity index 100% rename from test/persist/test.sh rename to premerge/test/persist/test.sh diff --git a/test/persist/test_failure_indices.sh b/premerge/test/persist/test_failure_indices.sh similarity index 100% rename from test/persist/test_failure_indices.sh rename to premerge/test/persist/test_failure_indices.sh diff --git a/test/persist/test_simple.sh b/premerge/test/persist/test_simple.sh similarity index 100% rename from test/persist/test_simple.sh rename to premerge/test/persist/test_simple.sh diff --git a/test/run_test.sh b/premerge/test/run_test.sh similarity index 100% rename from test/run_test.sh rename to premerge/test/run_test.sh diff --git a/test/test.sh b/premerge/test/test.sh similarity index 100% rename from test/test.sh rename to premerge/test/test.sh diff --git a/test/test_cover.sh b/premerge/test/test_cover.sh similarity index 100% rename from test/test_cover.sh rename to premerge/test/test_cover.sh diff --git a/test/test_libs.sh b/premerge/test/test_libs.sh similarity index 100% rename from test/test_libs.sh rename to premerge/test/test_libs.sh diff --git a/test/utils/txs.sh b/premerge/test/utils/txs.sh similarity index 100% rename from test/utils/txs.sh rename to premerge/test/utils/txs.sh diff --git a/types/block.go b/premerge/types/block.go similarity index 100% rename from types/block.go rename to premerge/types/block.go diff --git a/types/block_meta.go b/premerge/types/block_meta.go similarity index 100% rename from types/block_meta.go rename to premerge/types/block_meta.go diff --git a/types/canonical_json.go b/premerge/types/canonical_json.go similarity index 100% rename from types/canonical_json.go rename to premerge/types/canonical_json.go diff --git a/types/events.go b/premerge/types/events.go similarity index 100% rename from types/events.go rename to premerge/types/events.go diff --git a/types/genesis.go b/premerge/types/genesis.go similarity index 100% rename from types/genesis.go rename to premerge/types/genesis.go diff --git a/types/keys.go b/premerge/types/keys.go similarity index 100% rename from types/keys.go rename to premerge/types/keys.go diff --git a/types/log.go b/premerge/types/log.go similarity index 100% rename from types/log.go rename to premerge/types/log.go diff --git a/types/part_set.go b/premerge/types/part_set.go similarity index 100% rename from types/part_set.go rename to premerge/types/part_set.go diff --git a/types/part_set_test.go b/premerge/types/part_set_test.go similarity index 100% rename from types/part_set_test.go rename to premerge/types/part_set_test.go diff --git a/types/priv_validator.go b/premerge/types/priv_validator.go similarity index 100% rename from types/priv_validator.go rename to premerge/types/priv_validator.go diff --git a/types/priv_validator_test.go b/premerge/types/priv_validator_test.go similarity index 100% rename from types/priv_validator_test.go rename to premerge/types/priv_validator_test.go diff --git a/types/proposal.go b/premerge/types/proposal.go similarity index 100% rename from types/proposal.go rename to premerge/types/proposal.go diff --git a/types/proposal_test.go b/premerge/types/proposal_test.go similarity index 100% rename from types/proposal_test.go rename to premerge/types/proposal_test.go diff --git a/types/protobuf.go b/premerge/types/protobuf.go similarity index 100% rename from types/protobuf.go rename to premerge/types/protobuf.go diff --git a/types/services.go b/premerge/types/services.go similarity index 100% rename from types/services.go rename to premerge/types/services.go diff --git a/types/signable.go b/premerge/types/signable.go similarity index 100% rename from types/signable.go rename to premerge/types/signable.go diff --git a/types/tx.go b/premerge/types/tx.go similarity index 100% rename from types/tx.go rename to premerge/types/tx.go diff --git a/types/tx_test.go b/premerge/types/tx_test.go similarity index 100% rename from types/tx_test.go rename to premerge/types/tx_test.go diff --git a/types/validator.go b/premerge/types/validator.go similarity index 100% rename from types/validator.go rename to premerge/types/validator.go diff --git a/types/validator_set.go b/premerge/types/validator_set.go similarity index 100% rename from types/validator_set.go rename to premerge/types/validator_set.go diff --git a/types/validator_set_test.go b/premerge/types/validator_set_test.go similarity index 100% rename from types/validator_set_test.go rename to premerge/types/validator_set_test.go diff --git a/types/vote.go b/premerge/types/vote.go similarity index 100% rename from types/vote.go rename to premerge/types/vote.go diff --git a/types/vote_set.go b/premerge/types/vote_set.go similarity index 100% rename from types/vote_set.go rename to premerge/types/vote_set.go diff --git a/types/vote_set_test.go b/premerge/types/vote_set_test.go similarity index 100% rename from types/vote_set_test.go rename to premerge/types/vote_set_test.go diff --git a/types/vote_test.go b/premerge/types/vote_test.go similarity index 100% rename from types/vote_test.go rename to premerge/types/vote_test.go