KEP-1784 Fix swarmDB & bzapi compiler warnings for gcc 9.2.1

bluzelle · Oct 24, 2019 · 25c7506 · 25c7506
1 parent f5e24ff
commit 25c7506
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,6 +42,8 @@ else()
     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
         set(warnings "${warnings} -Wno-maybe-uninitialized")
     endif()
+
+    set(warnings "${warnings} -Wno-deprecated-copy -Wno-sign-compare")
 endif()
 
 set(CMAKE_CXX_FLAGS ${warnings})

diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake
@@ -27,7 +27,7 @@ set_property(DIRECTORY PROPERTY CLEAN_NO_CUSTOM
     "${CMAKE_CURRENT_BINARY_DIR}/googletest")
 
 ExternalProject_Get_Property(googletest source_dir)
-include_directories(${source_dir}/googlemock/include ${source_dir}/googletest/include)
+include_directories(SYSTEM ${source_dir}/googlemock/include ${source_dir}/googletest/include)
 
 ExternalProject_Get_Property(googletest binary_dir)
 link_directories(${binary_dir}/googlemock)

diff --git a/scripts/crud b/scripts/crud
@@ -21,6 +21,7 @@
 #
 
 import websocket
+import ssl
 import sys
 import random
 from argparse import ArgumentParser
@@ -65,7 +66,7 @@ def send_request(node, uuid, msg, loop=False, ws=None):
     global CRUD_SCRIPT_SENDER_ID
 
     if not ws:
-        ws = websocket.create_connection("ws://" + node)
+        ws = websocket.create_connection("wss://" + node)
     msg.header.db_uuid = uuid
 
     # hack!
@@ -102,7 +103,7 @@ def send_request(node, uuid, msg, loop=False, ws=None):
 
 
 def send_status_request(node):
-    ws = websocket.create_connection("ws://" + args.node)
+    ws = websocket.create_connection("wss://" + args.node,  sslopt={"cert_reqs": ssl.CERT_NONE})
     msg_outer = bluzelle_pb2.bzn_envelope()
     msg_inner = status_pb2.status_request()
     msg_outer.swarm_id = CRUD_SCRIPT_SWARM_ID