145 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lorenz Herzberger	2ecace2f63	fixed db test cases ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-13 14:48:14 +02:00
Lorenz Herzberger	f3279ca6fd	adjusted common tests for multiple assets ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-13 13:25:50 +02:00
Lorenz Herzberger	664fe6c772	adjusted backend queries for multiple assets ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-13 12:26:08 +02:00
Lorenz Herzberger	f0248800d3	added additional check to get_transaction ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-13 11:17:07 +02:00
ArpitShukla007	520b3c87cb	Resolved the error of validation for assets	2022-04-13 07:34:22 +00:00
Lorenz Herzberger	e184945443	fixed get_assets ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-12 15:01:50 +02:00
Lorenz Herzberger	b287fc1b7f	Merge branch 'asset-migration' of github.com:planetmint/planetmint into asset-migration	2022-04-12 13:06:24 +02:00
Lorenz Herzberger	7132ea40a6	convert cursor to list ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-12 12:09:19 +02:00
ArpitShukla007	752ebbb0e7	Merge branch 'asset-migration' of github.com:planetmint/planetmint into asset-migration	2022-04-12 08:36:02 +00:00
ArpitShukla007	52cf610648	Added ignore for .vscode	2022-04-12 08:35:36 +00:00
Lorenz Herzberger	f7a57a5915	minor changes to get_transaction ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-12 08:29:49 +02:00
Lorenz Herzberger	86c4a9e55e	fixed typo ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-11 13:27:45 +02:00
Lorenz Herzberger	1ade4fb608	added VS Code debugging section to tests/README.md ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-11 13:26:35 +02:00
Lorenz Herzberger	010e4c5d14	fixed some test cases ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-11 12:54:03 +02:00
Lorenz Herzberger	ebc1a4d85e	__init__ transfer now uses multiple assets ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-06 16:26:51 +02:00
Lorenz Herzberger	e32047d999	switched asset_id for asset_ids ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-06 14:20:10 +02:00
Lorenz Herzberger	6c34180b39	started replacing asset with assets ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-04-06 00:35:12 +02:00
Jürgen Eckel	5fd8bde123	changed planetmint-cryptoconditions reference (#85) ... * changed planetmint-cryptoconditions reference Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com> * increased version and added missing data Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>	2022-04-04 23:20:58 +02:00
Arpit Shukla	06085e3798	Merge pull request #81 from LaurentDeMontBlanc/update-transaction-schema-to-v3 ... Update transaction schema to v3	2022-03-31 11:37:34 +02:00
Lorenz Herzberger	167d970511	updated asset definition on v3.0 transaction types ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-31 11:09:32 +02:00
Lorenz Herzberger	d224877a97	moved transaction schemas to version folders ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-31 10:33:49 +02:00
Lorenz Herzberger	db304f6184	pinned werkzeug to version 2.0.3 (#76) ... Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-30 17:15:10 +02:00
Lorenz Herzberger	2d5d6dde3c	added __init__.py to planetmint transaction module (#63) ... * added __init__.py to planetmint transaction module Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * pinned jinja2 version for docs Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added jinja2==3.0.0 to docs requirements.txt Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-28 11:36:33 +02:00
Lorenz Herzberger	df7c1e1ccf	Enhance integration test suite (#62) ... * restructering, added helper, split cli tests for later Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * fixed threshold test Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added acceptance tests to integration test suite Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added different threshold signature test scenarios Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * started chain-migration test implementation Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * fixed linter errors Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * removed -s from test command Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-24 14:24:32 +01:00
Arpit Shukla	f9f1a64773	Merge pull request #61 from roninx991/main ... Removing create and transfer transactions from transaction.py file	2022-03-23 16:07:58 +01:00
Jürgen Eckel	69ad661a60	fixed last flake issues ... Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>	2022-03-23 14:13:51 +01:00
Sangat Das	a7fe94de1d	Resolve flake8 issues#4 ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-23 09:07:32 +00:00
Sangat Das	635d68c7ad	Resolve flake8 issues#3 ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-23 08:23:33 +00:00
Sangat Das	43ecbffe5e	Resolve flake8 issues#2 ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-23 08:08:20 +00:00
Sangat Das	0463fb22f9	Resolve flake8 issues#1 ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-22 09:41:28 +00:00
Sangat Das	a80a95897e	Resolve merge conflicts from main branch ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-22 07:57:46 +00:00
Sangat Das	0fee3607ee	Remove create and transfer code snippets from transaction.py ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-21 19:52:10 +00:00
RoninX	4d3eb6bfdb	Problem: Monolithic code files (#60) ... * Integrate zenroom acceptance test * fixed zenroom reference * added additional dependences to the docker fils so that zenroom can be executed. added zenroom from git repo, because pypi servs an older buggy version * using the custom planetmintdriver branch to avoid pypi zendesk downloads * Added zenroom test * Added zenroom test Signed-off-by: Sangat Das <sangatdas5@gmail.com> * Change reference to planetmint-driver to planetmint-driver-python Signed-off-by: Sangat Das <sangatdas5@gmail.com> * Basic structuring * Added new classes in transactions/common * Added Create and Transfer as separate transactions * Resolved errors related to transactions.common * Fixing imports * Resolved issues of election transaction * Resolve flake8 issues Signed-off-by: Sangat Das <sangatdas5@gmail.com> * Resolve remaining flake8 issues Signed-off-by: Sangat Das <sangatdas5@gmail.com> * Resolve remaining flake8 issues Signed-off-by: Sangat Das <sangatdas5@gmail.com> Co-authored-by: Jürgen Eckel <juergen@riddleandcode.com> Co-authored-by: ArpitShukla007 <arpitnshukla@gmail.com>	2022-03-15 07:21:16 +01:00
Sangat Das	c3284fe060	Resolve remaining flake8 issues ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-14 09:13:58 +00:00
Sangat Das	9b3bfc9911	Resolve remaining flake8 issues ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-14 08:08:54 +00:00
Sangat Das	51a92e3c3c	Resolve flake8 issues ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-13 15:05:22 +00:00
Sangat Das	30a14f2320	Resolve merge conflicts ... Signed-off-by: Sangat Das <sangatdas5@gmail.com>	2022-03-10 09:24:23 +00:00
ArpitShukla007	327ec2dc09	Resolved issues of election transaction	2022-03-10 08:07:14 +00:00
Sangat Das	be657ca4c4	Merge branch 'main' of github.com:Sangatdas/planetmint into main	2022-03-09 17:42:34 +00:00
Sangat Das	3963722039	Fixing imports	2022-03-09 17:42:24 +00:00
ArpitShukla007	1c744b744b	Resolved errors related to transactions.common	2022-03-09 17:39:14 +00:00
Sangat Das	3277fed2ce	Merge with import changes	2022-03-09 17:14:41 +00:00
Sangat Das	a421533e16	Added Create and Transfer as separate transactions	2022-03-09 17:12:36 +00:00
ArpitShukla007	e9b7aa0fc5	Added new classes in transactions/common	2022-03-09 17:10:37 +00:00
ArpitShukla007	64f5ec01f1	Basic structuring	2022-03-09 09:06:45 +00:00
Lorenz Herzberger	bf5b88fcb2	Scalable integration test (#57) ... * updated Dockerfile-all-in-one Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * adjusted all-in-one.bash and monit conf to work with dockerized setup Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * integration tests pass inconsistently Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added timeout for integration test pass Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * add startup control logic, adjusted tests to wait for transactions Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added pre-config for docker-compose approach, removed remnants of old integration tests Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * reverted changes to pkg, split pre-config, added clean-shared service Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * fixed path in all-in-one.bash Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added ipdb copyright notice Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * chmod planetmint-monit-config Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * removed entrypoint from Dockerfile-all-in-one Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added integration stage to travis matrix Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * removed unused secret Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * changed pre-config and docker-compose.integration.yml to support scaling Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * using env var to control number of nodes Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * make test-integration now scalable Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added make docs-integration, added .gitignore to python integration tests, updated readme and removed clutter Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * fixed linter errors Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * disable planetmint for test purpose Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * test docker-compose down Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * disable every job except integration test Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * need more logs Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * name collision? Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * reverted changes to debug ci Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added TODO for ci optimization Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-08 14:38:40 +01:00
Lorenz Herzberger	89a9caf597	Dc integration approach (#52) ... * updated Dockerfile-all-in-one Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * adjusted all-in-one.bash and monit conf to work with dockerized setup Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * integration tests pass inconsistently Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added timeout for integration test pass Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * add startup control logic, adjusted tests to wait for transactions Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added pre-config for docker-compose approach, removed remnants of old integration tests Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * reverted changes to pkg, split pre-config, added clean-shared service Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * fixed path in all-in-one.bash Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added ipdb copyright notice Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * chmod planetmint-monit-config Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * removed entrypoint from Dockerfile-all-in-one Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * added integration stage to travis matrix Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * removed unused secret Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>	2022-03-01 08:47:58 +01:00
Lorenz Herzberger	aaab849a98	disabled integration test to run forked project pipelines (#48) ... * disabled integration test to run forked project pipelines Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * changed zsh to zsh-common Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * changed zsh to zsh-common on all Dockerfiles Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * manually install zsh Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * move install to travis-before-install Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * zsh-common instead of zsh Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com> * update	2022-02-21 17:02:11 +01:00
Sangat Das	fd48880630	Resolves #20 (#47) ... * Integrate zenroom acceptance test * fixed zenroom reference * added additional dependences to the docker fils so that zenroom can be executed. added zenroom from git repo, because pypi servs an older buggy version * using the custom planetmintdriver branch to avoid pypi zendesk downloads * Added zenroom test * Added zenroom test Signed-off-by: Sangat Das <sangatdas5@gmail.com> * Change reference to planetmint-driver to planetmint-driver-python Signed-off-by: Sangat Das <sangatdas5@gmail.com> Co-authored-by: Jürgen Eckel <juergen@riddleandcode.com>	2022-02-21 10:59:09 +01:00
Sangat Das	357905f17c	Merge branch 'planetmint:main' into main	2022-02-21 10:45:25 +01:00