From 90f9f514218d7c342afda5d22f53ab9a0a8d4a59 Mon Sep 17 00:00:00 2001 From: Milo Davis Date: Fri, 27 Oct 2017 19:07:00 +0200 Subject: [PATCH] Merge `src/client/embedded/alpha/baker/*` into `src/client/embedded/alpha/` --- src/client/embedded/alpha/Makefile | 20 ++++++++++++++-- src/client/embedded/alpha/baker/Makefile | 23 ------------------- .../alpha/{baker => }/client_mining_blocks.ml | 0 .../{baker => }/client_mining_blocks.mli | 0 .../alpha/{baker => }/client_mining_daemon.ml | 0 .../{baker => }/client_mining_daemon.mli | 0 .../{baker => }/client_mining_denunciation.ml | 0 .../client_mining_denunciation.mli | 0 .../{baker => }/client_mining_endorsement.ml | 0 .../{baker => }/client_mining_endorsement.mli | 0 .../alpha/{baker => }/client_mining_forge.ml | 0 .../alpha/{baker => }/client_mining_forge.mli | 0 .../alpha/{baker => }/client_mining_main.ml | 0 .../alpha/{baker => }/client_mining_main.mli | 0 .../{baker => }/client_mining_operations.ml | 2 -- .../{baker => }/client_mining_operations.mli | 0 .../{baker => }/client_mining_revelation.ml | 1 - .../{baker => }/client_mining_revelation.mli | 0 test/proto_alpha/Makefile | 1 - 19 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 src/client/embedded/alpha/baker/Makefile rename src/client/embedded/alpha/{baker => }/client_mining_blocks.ml (100%) rename src/client/embedded/alpha/{baker => }/client_mining_blocks.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_daemon.ml (100%) rename src/client/embedded/alpha/{baker => }/client_mining_daemon.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_denunciation.ml (100%) rename src/client/embedded/alpha/{baker => }/client_mining_denunciation.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_endorsement.ml (100%) rename src/client/embedded/alpha/{baker => }/client_mining_endorsement.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_forge.ml (100%) rename src/client/embedded/alpha/{baker => }/client_mining_forge.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_main.ml (100%) rename src/client/embedded/alpha/{baker => }/client_mining_main.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_operations.ml (99%) rename src/client/embedded/alpha/{baker => }/client_mining_operations.mli (100%) rename src/client/embedded/alpha/{baker => }/client_mining_revelation.ml (98%) rename src/client/embedded/alpha/{baker => }/client_mining_revelation.mli (100%) diff --git a/src/client/embedded/alpha/Makefile b/src/client/embedded/alpha/Makefile index 28165f541..c7c972706 100644 --- a/src/client/embedded/alpha/Makefile +++ b/src/client/embedded/alpha/Makefile @@ -10,7 +10,15 @@ CLIENT_INTFS := \ client_proto_programs.mli \ client_proto_context.mli \ client_proto_nonces.mli \ - client_proto_main.mli + client_proto_main.mli \ + client_mining_blocks.mli \ + client_mining_operations.mli \ + client_mining_endorsement.mli \ + client_mining_denunciation.mli \ + client_mining_revelation.mli \ + client_mining_forge.mli \ + client_mining_daemon.mli \ + client_mining_main.mli \ CLIENT_IMPLS := \ client_proto_alpha.ml \ @@ -23,7 +31,15 @@ CLIENT_IMPLS := \ client_proto_programs.ml \ client_proto_context.ml \ client_proto_nonces.ml \ - client_proto_main.ml + client_proto_main.ml \ + client_mining_blocks.ml \ + client_mining_operations.ml \ + client_mining_endorsement.ml \ + client_mining_denunciation.ml \ + client_mining_revelation.ml \ + client_mining_forge.ml \ + client_mining_daemon.ml \ + client_mining_main.ml -include baker/Makefile diff --git a/src/client/embedded/alpha/baker/Makefile b/src/client/embedded/alpha/baker/Makefile deleted file mode 100644 index afcaf002c..000000000 --- a/src/client/embedded/alpha/baker/Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -SOURCE_DIRECTORIES += baker - -CLIENT_INTFS += \ - baker/client_mining_blocks.mli \ - baker/client_mining_operations.mli \ - baker/client_mining_endorsement.mli \ - baker/client_mining_denunciation.mli \ - baker/client_mining_revelation.mli \ - baker/client_mining_forge.mli \ - baker/client_mining_daemon.mli \ - baker/client_mining_main.mli \ - -CLIENT_IMPLS += \ - baker/client_mining_blocks.ml \ - baker/client_mining_operations.ml \ - baker/client_mining_endorsement.ml \ - baker/client_mining_denunciation.ml \ - baker/client_mining_revelation.ml \ - baker/client_mining_forge.ml \ - baker/client_mining_daemon.ml \ - baker/client_mining_main.ml \ - diff --git a/src/client/embedded/alpha/baker/client_mining_blocks.ml b/src/client/embedded/alpha/client_mining_blocks.ml similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_blocks.ml rename to src/client/embedded/alpha/client_mining_blocks.ml diff --git a/src/client/embedded/alpha/baker/client_mining_blocks.mli b/src/client/embedded/alpha/client_mining_blocks.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_blocks.mli rename to src/client/embedded/alpha/client_mining_blocks.mli diff --git a/src/client/embedded/alpha/baker/client_mining_daemon.ml b/src/client/embedded/alpha/client_mining_daemon.ml similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_daemon.ml rename to src/client/embedded/alpha/client_mining_daemon.ml diff --git a/src/client/embedded/alpha/baker/client_mining_daemon.mli b/src/client/embedded/alpha/client_mining_daemon.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_daemon.mli rename to src/client/embedded/alpha/client_mining_daemon.mli diff --git a/src/client/embedded/alpha/baker/client_mining_denunciation.ml b/src/client/embedded/alpha/client_mining_denunciation.ml similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_denunciation.ml rename to src/client/embedded/alpha/client_mining_denunciation.ml diff --git a/src/client/embedded/alpha/baker/client_mining_denunciation.mli b/src/client/embedded/alpha/client_mining_denunciation.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_denunciation.mli rename to src/client/embedded/alpha/client_mining_denunciation.mli diff --git a/src/client/embedded/alpha/baker/client_mining_endorsement.ml b/src/client/embedded/alpha/client_mining_endorsement.ml similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_endorsement.ml rename to src/client/embedded/alpha/client_mining_endorsement.ml diff --git a/src/client/embedded/alpha/baker/client_mining_endorsement.mli b/src/client/embedded/alpha/client_mining_endorsement.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_endorsement.mli rename to src/client/embedded/alpha/client_mining_endorsement.mli diff --git a/src/client/embedded/alpha/baker/client_mining_forge.ml b/src/client/embedded/alpha/client_mining_forge.ml similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_forge.ml rename to src/client/embedded/alpha/client_mining_forge.ml diff --git a/src/client/embedded/alpha/baker/client_mining_forge.mli b/src/client/embedded/alpha/client_mining_forge.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_forge.mli rename to src/client/embedded/alpha/client_mining_forge.mli diff --git a/src/client/embedded/alpha/baker/client_mining_main.ml b/src/client/embedded/alpha/client_mining_main.ml similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_main.ml rename to src/client/embedded/alpha/client_mining_main.ml diff --git a/src/client/embedded/alpha/baker/client_mining_main.mli b/src/client/embedded/alpha/client_mining_main.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_main.mli rename to src/client/embedded/alpha/client_mining_main.mli diff --git a/src/client/embedded/alpha/baker/client_mining_operations.ml b/src/client/embedded/alpha/client_mining_operations.ml similarity index 99% rename from src/client/embedded/alpha/baker/client_mining_operations.ml rename to src/client/embedded/alpha/client_mining_operations.ml index e14793853..598bfbfc6 100644 --- a/src/client/embedded/alpha/baker/client_mining_operations.ml +++ b/src/client/embedded/alpha/client_mining_operations.ml @@ -9,8 +9,6 @@ module Ed25519 = Environment.Ed25519 -open Logging.Client.Mining - open Operation type operation = { diff --git a/src/client/embedded/alpha/baker/client_mining_operations.mli b/src/client/embedded/alpha/client_mining_operations.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_operations.mli rename to src/client/embedded/alpha/client_mining_operations.mli diff --git a/src/client/embedded/alpha/baker/client_mining_revelation.ml b/src/client/embedded/alpha/client_mining_revelation.ml similarity index 98% rename from src/client/embedded/alpha/baker/client_mining_revelation.ml rename to src/client/embedded/alpha/client_mining_revelation.ml index 4e684e683..6b21b93ac 100644 --- a/src/client/embedded/alpha/baker/client_mining_revelation.ml +++ b/src/client/embedded/alpha/client_mining_revelation.ml @@ -9,7 +9,6 @@ open Cli_entries open Tezos_context -open Logging.Client.Revelation let inject_seed_nonce_revelation rpc_config block ?force ?async nonces = let operations = diff --git a/src/client/embedded/alpha/baker/client_mining_revelation.mli b/src/client/embedded/alpha/client_mining_revelation.mli similarity index 100% rename from src/client/embedded/alpha/baker/client_mining_revelation.mli rename to src/client/embedded/alpha/client_mining_revelation.mli diff --git a/test/proto_alpha/Makefile b/test/proto_alpha/Makefile index 2aff65ce5..8dbf2c85e 100644 --- a/test/proto_alpha/Makefile +++ b/test/proto_alpha/Makefile @@ -14,7 +14,6 @@ SOURCE_DIRECTORIES := \ ${SRCDIR}/proto \ ${SRCDIR}/client/embedded \ ${SRCDIR}/client/embedded/alpha \ - ${SRCDIR}/client/embedded/alpha/baker \ ../lib LIB := \