status-im
/
nim-status
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: add setup and teardown foreign thread gc functions and nim-tests target

This commit is contained in:
Richard Ramos 2020-07-13 10:26:31 -04:00
parent f493853581
commit d007fdba2f
No known key found for this signature in database
GPG Key ID: 80D4B01265FDFE8F
5 changed files with 129 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -137,12 +137,16 @@ tests: | $(NIMSTATUS) $(STATUSGO)
mkdir -p keystore
echo "Compiling 'test/test'"
ifeq ($(detected_OS), Darwin)
$(CC) -I"$(CURDIR)/build" -I"$(CURDIR)/vendor/nimbus-build-system/vendor/Nim/lib" test/test.c $(NIMSTATUS) $(STATUSGO) -framework CoreFoundation -framework CoreServices -framework IOKit -framework Security -lm -pthread -o test/test
$(ENV_SCRIPT) $(CC) -I"$(CURDIR)/build" -I"$(CURDIR)/vendor/nimbus-build-system/vendor/Nim/lib" test/test.c $(NIMSTATUS) $(STATUSGO) -framework CoreFoundation -framework CoreServices -framework IOKit -framework Security -lm -pthread -o test/test
else
$(CC) -I"$(CURDIR)/build" -I"$(CURDIR)/vendor/nimbus-build-system/vendor/Nim/lib" test/test.c $(NIMSTATUS) $(STATUSGO) -lm -pthread -o test/test
$(ENV_SCRIPT) $(CC) -I"$(CURDIR)/build" -I"$(CURDIR)/vendor/nimbus-build-system/vendor/Nim/lib" test/test.c $(NIMSTATUS) $(STATUSGO) -lm -pthread -o test/test
endif
echo "Executing 'test/test'"
./test/test
$(ENV_SCRIPT) ./test/test
$(ENV_SCRIPT) nimble test
nim-tests: | $(NIMSTATUS) $(STATUSGO)
rm -Rf build/*
$(ENV_SCRIPT) nimble test
endif # "variables.mk" was not included

15
nim_status.nimble
View File

@ -11,3 +11,18 @@ skipDirs = @["test"]
# Deps
requires "nim >= 1.0.0"
### Helper functions
proc buildAndRunBinary(name: string, srcDir = "./", params = "", cmdParams = "", lang = "c") =
if not dirExists "build":
mkDir "build"
# allow something like "nim test --verbosity:0 --hints:off beacon_chain.nims"
var extra_params = params
for i in 2..<paramCount():
extra_params &= " " & paramStr(i)
exec "nim " & lang & " --out:./build/" & name & " -r " & extra_params & " " & srcDir & name & ".nim" & " " & cmdParams
### tasks
task test, "Run all tests":
buildAndRunBinary "test1", "tests/"

104
src/nim_status.nim
View File

@ -5,157 +5,261 @@ import types
# and it will complain of duplication of function names
proc hashMessage*(message: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.HashMessage(message)
tearDownForeignThreadGc()
proc initKeystore*(keydir: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.InitKeystore(keydir)
tearDownForeignThreadGc()
proc openAccounts*(datadir: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.OpenAccounts(datadir)
tearDownForeignThreadGc()
proc multiAccountGenerateAndDeriveAddresses*(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountGenerateAndDeriveAddresses(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountStoreDerivedAccounts*(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountStoreDerivedAccounts(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountImportMnemonic*(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountImportMnemonic(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountImportPrivateKey*(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountImportPrivateKey(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountDeriveAddresses*(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountDeriveAddresses(paramsJSON)
tearDownForeignThreadGc()
proc saveAccountAndLogin*(accountData: cstring, password: cstring, settingsJSON: cstring, configJSON: cstring, subaccountData: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SaveAccountAndLogin(accountData, password, settingsJSON, configJSON, subaccountData)
tearDownForeignThreadGc()
proc callRPC*(inputJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.CallRPC(inputJSON)
tearDownForeignThreadGc()
proc callPrivateRPC*(inputJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.CallPrivateRPC(inputJSON)
tearDownForeignThreadGc()
proc addPeer*(peer: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.AddPeer(peer)
tearDownForeignThreadGc()
proc setSignalEventCallback*(callback: SignalCallback) {.exportc.} =
setupForeignThreadGc()
status_go.SetSignalEventCallback(callback)
tearDownForeignThreadGc()
proc sendTransaction*(jsonArgs: cstring, password: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SendTransaction(jsonArgs, password)
tearDownForeignThreadGc()
proc generateAlias*(pk: GoString): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.GenerateAlias(pk)
tearDownForeignThreadGc()
proc identicon*(pk: GoString): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.Identicon(pk)
tearDownForeignThreadGc()
proc login*(accountData: cstring, password: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.Login(accountData, password)
tearDownForeignThreadGc()
proc logout*(): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.Logout()
tearDownForeignThreadGc()
proc verifyAccountPassword*(keyStoreDir: cstring, address: cstring, password: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.VerifyAccountPassword(keyStoreDir, address, password)
tearDownForeignThreadGc()
proc validateMnemonic*(mnemonic: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ValidateMnemonic(mnemonic)
tearDownForeignThreadGc()
proc recoverAccount(password: cstring, mnemonic: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.RecoverAccount(password, mnemonic)
tearDownForeignThreadGc()
proc startOnboarding(n: cint, mnemonicPhraseLength: cint): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.StartOnboarding(n, mnemonicPhraseLength)
tearDownForeignThreadGc()
proc saveAccountAndLoginWithKeycard(accountData: cstring, password: cstring, settingsJSON: cstring, configJSON: cstring, subaccountData: cstring, keyHex: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SaveAccountAndLoginWithKeycard(accountData, password, settingsJSON, configJSON, subaccountData, keyHex)
tearDownForeignThreadGc()
proc hashTransaction(txArgsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.HashTransaction(txArgsJSON)
tearDownForeignThreadGc()
proc extractGroupMembershipSignatures(signaturePairsStr: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ExtractGroupMembershipSignatures(signaturePairsStr)
tearDownForeignThreadGc()
proc connectionChange(typ: cstring, expensive: cstring) {.exportc.} =
setupForeignThreadGc()
status_go.ConnectionChange(typ, expensive)
tearDownForeignThreadGc()
proc multiformatSerializePublicKey(key: cstring, outBase: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiformatSerializePublicKey(key, outBase)
tearDownForeignThreadGc()
proc multiformatDeserializePublicKey(key: cstring, outBase: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiformatDeserializePublicKey(key, outBase)
tearDownForeignThreadGc()
proc validateNodeConfig(configJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ValidateNodeConfig(configJSON)
tearDownForeignThreadGc()
proc loginWithKeycard(accountData: cstring, password: cstring, keyHex: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.LoginWithKeycard(accountData, password, keyHex)
tearDownForeignThreadGc()
proc recover(rpcParams: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.Recover(rpcParams)
tearDownForeignThreadGc()
proc writeHeapProfile(dataDir: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.WriteHeapProfile(dataDir)
tearDownForeignThreadGc()
proc importOnboardingAccount(id: cstring, password: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ImportOnboardingAccount(id, password)
tearDownForeignThreadGc()
proc removeOnboarding() {.exportc.} =
setupForeignThreadGc()
status_go.RemoveOnboarding()
tearDownForeignThreadGc()
proc hashTypedData(data: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.HashTypedData(data)
tearDownForeignThreadGc()
proc resetChainData(): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ResetChainData()
tearDownForeignThreadGc()
proc signMessage(rpcParams: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SignMessage(rpcParams)
tearDownForeignThreadGc()
proc signTypedData(data: cstring, address: cstring, password: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SignTypedData(data, address, password)
tearDownForeignThreadGc()
proc stopCPUProfiling(): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.StopCPUProfiling()
tearDownForeignThreadGc()
proc getNodesFromContract(rpcEndpoint: cstring, contractAddress: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.GetNodesFromContract(rpcEndpoint, contractAddress)
tearDownForeignThreadGc()
proc exportNodeLogs(): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ExportNodeLogs()
tearDownForeignThreadGc()
proc chaosModeUpdate(on: cint): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.ChaosModeUpdate(on)
tearDownForeignThreadGc()
proc signHash(hexEncodedHash: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SignHash(hexEncodedHash)
tearDownForeignThreadGc()
proc createAccount(password: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.CreateAccount(password)
tearDownForeignThreadGc()
proc sendTransactionWithSignature(txtArgsJSON: cstring, sigString: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SendTransactionWithSignature(txtArgsJSON, sigString)
tearDownForeignThreadGc()
proc startCPUProfile(dataDir: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.StartCPUProfile(dataDir)
tearDownForeignThreadGc()
proc appStateChange(state: cstring) {.exportc.} =
setupForeignThreadGc()
status_go.AppStateChange(state)
tearDownForeignThreadGc()
proc signGroupMembership(content: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.SignGroupMembership(content)
tearDownForeignThreadGc()
proc multiAccountStoreAccount(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountStoreAccount(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountLoadAccount(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountLoadAccount(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountGenerate(paramsJSON: cstring): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountGenerate(paramsJSON)
tearDownForeignThreadGc()
proc multiAccountReset(): cstring {.exportc.} =
setupForeignThreadGc()
result = status_go.MultiAccountReset()
tearDownForeignThreadGc()

2
test/test.c
View File

@ -80,8 +80,6 @@ int main(int argc, char* argv[]) {
setSignalEventCallback(&eventCallback);
// TODO: tests GC strings
while(1) {
printf("...\n");
sleep(1);

2
tests/test1.nim Normal file
View File

@ -0,0 +1,2 @@
echo "Executing test 1"
assert 1 == 1