Fixed issues w/ rebase onto upstream/master.

Author: ksedgwic

contrib/remote_hsmd/Makefile

@@ -37,6 +37,7 @@ RMTHSMD_COMMON_OBJS :=				\
 	common/amount.o				\
 	common/bigsize.o			\
 	common/bip32.o				\
+	common/channel_id.o			\
 	common/daemon.o				\
 	common/daemon_conn.o			\
 	common/derive_basepoints.o		\
@@ -48,6 +49,7 @@ RMTHSMD_COMMON_OBJS :=				\
 	common/msg_queue.o			\
 	common/node_id.o			\
 	common/permute_tx.o			\
+	common/setup.o				\
 	common/status.o				\
 	common/status_wire.o			\
 	common/subdaemon.o			\

contrib/remote_hsmd/scripts/run-one-test

@@ -2,20 +2,15 @@
 
 THETEST=$1
 
-export PYTHONPATH=\
-`pwd`/hsmd:\
-`pwd`/contrib/pylightning:\
-`pwd`/contrib/pyln-proto:\
-`pwd`/contrib/pyln-testing:\
-`pwd`/contrib/pyln-client:\
-$PYTHONPATH
-
+PYTHONPATH=\
+$PWD/contrib/pyln-client:\
+$PWD/contrib/pyln-testing:\
+$PWD/contrib/pyln-proto/: \
 TEST_DEBUG=1 \
 DEVELOPER=1 \
 VALGRIND=0 \
 SLOW_MACHINE=1 \
 SUBDAEMON='hsmd:remote_hsmd' \
 pytest \
 $THETEST \
--v --timeout=550 --timeout_method=thread -x -s
-
+-v --timeout=550 --timeout_method=thread -x