Merge pull request #6 from bitcoincore-dev/v0.0.7

V0.0.7

Author: RandyMcMillan

Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get install docker.io -y
 RUN echo $(date +%s) > updated
 FROM docker as clone
 RUN rm -rf /src
-RUN git clone --branch v0.0.6 --depth 1 https://github.com/bitcoincore-dev/miniscript-docker /src
+RUN git clone --branch v0.0.7 --depth 1 https://github.com/bitcoincore-dev/miniscript-docker /src
 RUN echo $(date +%s) > updated
 FROM clone as make
 WORKDIR /src

GNUmakefile

@@ -44,9 +44,8 @@ docker-miniscript:docker-build## 		docker-miniscript
 	@[[ -z "$(shell file ./miniscript | grep inux)" ]] && echo "not linux" && rm ./miniscript || echo "miniscript is built for linux"
 	@$(DOCKER) run --rm -v $(PWD):/src --publish 80:8080  miniscript sh -c "make install"
 
-.PHONY:test-command
-test-command:
-	@cat $< $@ && exit;
+test:
+	@bash $< $@.sh || $(MAKE) miniscript
 
 example-commands:
 	@printf "\n"

main.cpp

@@ -23,7 +23,7 @@ static bool run(std::string&& line, int64_t count) {
         assert(str);
 
         printf(
-				"\n{ \"X\":\"X\",\n\"total\":\"%17.10f\",\n\"script\":\"%5i\",\n\"miniscript\":\"%s\"\n }\n",
+				"\n{ \"X\":\"X\",\n\"total\":\"%17.10f\",\n\"scriptlen\":\"%5i\",\n\"miniscript\":\"%s\"\n }\n",
 				ret->ScriptSize() + avgcost, (int)ret->ScriptSize(),
 				Abbreviate(std::move(*str)).c_str()
 				);

test.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+echo "and(pk(A),or(pk(B),or(9@pk(C),older(1000))))" | ./miniscript;
+echo "and_v(or_c(pk(B),or_c(pk(C),v:older(1000))),pk(A))" | ./miniscript