Merge pull request #7 from bitcoincore-dev/v0.0.8

V0.0.8

Author: RandyMcMillan

Dockerfile

@@ -10,15 +10,9 @@ RUN apt-get install systemd bash jq -y
 RUN echo $(date +%s) > updated
 RUN chmod +x /usr/bin/systemctl
 RUN echo $(date +%s) > updated
-FROM systemd as pandoc
-RUN apt-get install pandoc -y
-RUN echo $(date +%s) > updated
-FROM pandoc as docker
-RUN apt-get install docker.io -y
-RUN echo $(date +%s) > updated
-FROM docker as clone
+FROM systemd as clone
 RUN rm -rf /src
-RUN git clone --branch v0.0.7 --depth 1 https://github.com/bitcoincore-dev/miniscript-docker /src
+RUN git clone --branch v0.0.8 --depth 1 https://github.com/bitcoincore-dev/miniscript-docker /src
 RUN echo $(date +%s) > updated
 FROM clone as make
 WORKDIR /src

GNUmakefile

@@ -44,8 +44,9 @@ 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"
 
-test:
-	@bash $< $@.sh || $(MAKE) miniscript
+.PHONY:miniscript-tests
+miniscript-tests:## 	miniscript-tests
+	@bash $< $@ 2>/dev/null || true
 
 example-commands:
 	@printf "\n"

Makefile

@@ -1,7 +1,7 @@
 HEADERS := bitcoin/util/vector.h bitcoin/util/strencodings.h bitcoin/span.h bitcoin/util/spanparsing.h bitcoin/script/script.h bitcoin/script/miniscript.h compiler.h bitcoin/crypto/common.h bitcoin/serialize.h bitcoin/prevector.h bitcoin/compat/endian.h bitcoin/compat/byteswap.h bitcoin/attributes.h bitcoin/tinyformat.h bitcoin/primitives/transaction.h
 SOURCES := bitcoin/util/strencodings.cpp bitcoin/util/spanparsing.cpp bitcoin/script/script.cpp bitcoin/script/miniscript.cpp compiler.cpp
 
-miniscript: $(HEADERS) $(SOURCES) main.cpp
+miniscript: $(HEADERS) $(SOURCES) main.cpp## 		miniscript
 	g++ -O3 -g0 -Wall -std=c++17 -march=native -flto -Ibitcoin $(SOURCES) main.cpp -o miniscript
 
 miniscript.js: $(HEADERS) $(SOURCES) js_bindings.cpp

miniscript-test-0

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+JQ=$(which jq)
+echo "or_i(and_v(v:thresh(2,pkh(M1),a:pkh(M2),a:pkh(M3)),after(1005)),and_v(v:thresh(2,pk(P1),s:pk(P2),s:pk(P3),sun:after(1002),sun:after(1003)),and_v(or_c(pk(SA1),or_c(pk(SA3),v:pkh(SA2))),thresh(2,pk(A1),s:pk(A2),s:pk(A3),sln:after(1004)))))" | ./miniscript | $JQ || true

miniscript-tests

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+[[ -z "$(command -v miniscript-tests)" ]] && \
+        install $0 /usr/local/bin || true
+## add your won tests
+## miniscript-test-0
+## miniscript-test-1000
+## etc..
+
+TESTS=$(echo miniscript-test-{0..1000})
+for ms in $TESTS
+do
+    . $ms 2>/dev/null
+done