From 1465125f576425e2279e6525f236d9b29774347a Mon Sep 17 00:00:00 2001
From: Jacques Wagener <jacques@dilectum.co.za>
Date: Thu, 9 Jan 2020 10:44:44 +0200
Subject: [PATCH] Add Basic print example.

---
 Makefile                                       |  8 +++++++-
 examples/panicoverride.nim                     |  8 ++++++++
 tests/substrate/test.sh                        |  2 +-
 tests/substrate/tests/contract-nimplay.spec.ts | 10 +---------
 tests/substrate/tests/utils.ts                 |  1 -
 tools/eth_postprocess.sh                       |  2 --
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 7b73ccd..0c4c743 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ DOCKER_NLVM_C=$(DOCKER_NLVM) $(PATH_PARAMS) $(NLVM_WAMS32_FLAGS) c
 # Use nim + clang
 DOCKER_NIM_CLANG=docker run -e HOME='/tmp/' --user $(user_id):$(user_id) -w /code/ -v $(pwd):/code/ --entrypoint="/usr/bin/nim" jacqueswww/nimclang --verbosity:2
 DOCKER_NIM_CLANG_PASS_FLAGS = --passC:"--target=wasm32-unknown-unknown-wasm" \
---passL:"--target=wasm32-unknown-unknown-wasm" --passC:"-I./include" --clang.options.linker:"-nostdlib -Wl,--no-entry,--allow-undefined,--strip-all,--export-dynamic"
+--passL:"--target=wasm32-unknown-unknown-wasm" --passC:"-I./include" --clang.options.linker:"-nostdlib -Wl,--no-entry,--allow-undefined,--strip-all,--export-dynamic,--import-memory,--max-memory=131072"
 DOCKER_NIM_CLANG_FLAGS=$(DOCKER_NIM_CLANG_PASS_FLAGS) --os:standalone --cpu:i386 --cc:clang --gc:none --nomain -d:release
 DOCKER_NIM_CLANG_C=$(DOCKER_NIM_CLANG) --cc:clang $(PATH_PARAMS) c
 DOCKER_NIM_CLANG_WASM32_C=$(DOCKER_NIM_CLANG) $(DOCKER_NIM_CLANG_FLAGS) $(PATH_PARAMS) c
@@ -86,11 +86,17 @@ test-ee: ee-examples
 	cd tests/ee/; \
 	   ./test.sh
 
+
+
+SUBSTRATE_POSTPROCESS=tools/substrate_postprocess.sh
+
 .PHONY: substrate-examples
 substrate-examples:
 	$(WASM32_NIMC) --out:examples/substrate/hello_world.wasm examples/substrate/hello_world.nim
+	$(SUBSTRATE_POSTPROCESS) examples/substrate/hello_world.wasm
 
 .PHONY: test-substrate
 test-substrate: substrate-examples	
 	cd tests/substrate; \
 		SUBSTRATE_PATH="${HOME}/.cargo/bin/substrate" ./test.sh
+
diff --git a/examples/panicoverride.nim b/examples/panicoverride.nim
index c122d82..527f050 100644
--- a/examples/panicoverride.nim
+++ b/examples/panicoverride.nim
@@ -4,3 +4,11 @@ proc rawoutput(s: string) =
     revert(cstring(s), s.len.int32)
 proc panic(s: string) = rawoutput(s)
 {.pop.}
+
+
+# Try LLVm builtin unreachable:
+# void myabort(void) __attribute__((noreturn));
+# void myabort(void) {
+#   asm("int3");
+#   __builtin_unreachable();
+# }
diff --git a/tests/substrate/test.sh b/tests/substrate/test.sh
index dee896c..53706be 100755
--- a/tests/substrate/test.sh
+++ b/tests/substrate/test.sh
@@ -12,7 +12,7 @@ fi
 
 # Purge dev chain and then spin up the substrate node in background
 $SUBSTRATE_PATH purge-chain --dev -y
-$SUBSTRATE_PATH --dev &
+$SUBSTRATE_PATH --dev -l debug &
 SUBSTRATE_PID=$!
 
 # # Execute tests
diff --git a/tests/substrate/tests/contract-nimplay.spec.ts b/tests/substrate/tests/contract-nimplay.spec.ts
index 727028d..030af14 100644
--- a/tests/substrate/tests/contract-nimplay.spec.ts
+++ b/tests/substrate/tests/contract-nimplay.spec.ts
@@ -79,18 +79,10 @@ describe("Nimplay Hello World", () => {
       STORAGE_KEY
     );
     expect(initialValue).toBeDefined();
-    expect(initialValue.toString()).toEqual("0x00");
+    expect(initialValue.toString()).toEqual("");
 
     await callContract(api, testAccount, address, "0x00");
 
-    const newValue = await getContractStorage(api, address, STORAGE_KEY);
-    expect(newValue.toString()).toEqual("0x01");
-
-    await callContract(api, testAccount, address, "0x00");
-
-    const flipBack = await getContractStorage(api, address, STORAGE_KEY);
-    expect(flipBack.toString()).toEqual("0x00");
-
     done();
   });
 
diff --git a/tests/substrate/tests/utils.ts b/tests/substrate/tests/utils.ts
index 0119fd6..d4be1ab 100644
--- a/tests/substrate/tests/utils.ts
+++ b/tests/substrate/tests/utils.ts
@@ -39,7 +39,6 @@ export async function putCode(
     .toString("hex");
   const tx = api.tx.contracts.putCode(gasRequired, `0x${wasmCode}`);
   const result: any = await sendAndReturnFinalized(signer, tx);
-  console.log('result', result)
   const record = result.findRecord("contracts", "CodeStored");
 
   if (!record) {
diff --git a/tools/eth_postprocess.sh b/tools/eth_postprocess.sh
index b0d063d..59d9fc5 100755
--- a/tools/eth_postprocess.sh
+++ b/tools/eth_postprocess.sh
@@ -10,9 +10,7 @@ set -ex
 wasm2wat="docker run --entrypoint=wasm2wat -w /code/ -v $(pwd):/code/ jacqueswww/nimclang "
 wat2wasm="docker run --entrypoint=wat2wasm -w /code/ -v $(pwd):/code/ jacqueswww/nimclang "
 
-# Replace "env" with "ethereum"
 $wasm2wat "$WASM_FILE" |
- sed 's/(import "env" /(import "ethereum" /g' |
  sed  '/(export.*memory\|main.*/! s/(export.*//g' > ./wasm.tmp
 
 $wat2wasm -o "$WASM_FILE" ./wasm.tmp