Merge branch 'main' into collin/pubsub

PeggyJV · Jun 27, 2023 · 8388b4b · 8388b4b
2 parents f9b1e99 + 76e1a19
commit 8388b4b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/go.sum b/go.sum
@@ -2473,6 +2473,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

diff --git a/src/commands/start.rs b/src/commands/start.rs
@@ -10,6 +10,7 @@ use crate::{
         proposals::start_scheduled_cork_proposal_polling_thread,
     },
     prelude::*,
+    proto::contract_call_service_server::ContractCallServiceServer,
     pubsub::cache::start_publisher_trust_state_cache_thread,
     server::start_server_management_thread,
 };

diff --git a/src/simulate.rs b/src/simulate.rs
@@ -68,6 +68,7 @@ impl proto::simulate_contract_call_service_server::SimulateContractCallService f
 pub fn get_string_encoded_call(request: ScheduleRequest) -> Result<String, Error> {
     get_encoded_call(request).map(|b| bytes_to_hex_str(&b))
 }
+<<<<<<< HEAD
 
 pub fn validate_simulate_tls_config(config: &StewardConfig) {
     if config.simulate.server_cert_path.is_empty() {
@@ -114,3 +115,5 @@ pub async fn load_simulate_tls_config(
         .identity(server_identity.clone())
         .client_ca_root(client_ca_cert))
 }
+=======
+>>>>>>> main