Merge pull request berty#2126 from berty/dev/moul/clean-reorganize

sakul-budhathoki · Jun 26, 2020 · 64fcbeb · 64fcbeb
2 parents c139db8 + 5a87585
commit 64fcbeb
Show file tree

Hide file tree

Showing 77 changed files with 13 additions and 81 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/entrypoints/berty b/entrypoints/berty
diff --git a/js/Makefile b/js/Makefile
@@ -145,7 +145,7 @@ ios.run: deps packages/go-bridge/ios/Frameworks/Bertybridge.framework packages/b
 .PHONY: ios.release
 ios.release: deps packages/go-bridge/ios/Frameworks/Bertybridge.framework packages/berty-app/ios/Pods/Manifest.lock
 	cd packages/berty-app && bundle install
-	../build/shell/release-ios.sh
+	../tool/build/shell/release-ios.sh
 
 .PHONY: ios.log
 ios.log:
@@ -166,13 +166,13 @@ ios.storybook: deps packages/storybook-mobile/ios/Pods _storybook.mobile.start
 android.run: deps packages/go-bridge/android/libs/gobridge.aar packages/berty-app/node_modules/react-native/react.gradle.orig $(HOME)/.android/debug.keystore
 	$(call check-program, adb)
 	$(eval ANDROID_DEVICE ?= `adb devices | tail +2 | head -1 | cut -f 1`)
-	../build/shell/check-java.sh 18
+	../tool/build/shell/check-java.sh 18
 	adb -s $(ANDROID_DEVICE) reverse tcp:$(BERTY_BRIDGE_PORT) tcp:$(BERTY_BRIDGE_PORT)
 	cd packages/berty-app && $(react-native) run-android --no-packager --variant=$(APP_TARGET) --deviceId="$(ANDROID_DEVICE)" $(if $(filter-out $(APP_TARGET), store), --appIdSuffix=$(APP_TARGET))
 
 .PHONY: android.release
 android.release: deps packages/go-bridge/android/libs/gobridge.aar packages/berty-app/node_modules/react-native/react.gradle.orig $(HOME)/.android/debug.keystore
-	../build/shell/release-android.sh
+	../tool/build/shell/release-android.sh
 
 .PHONY: android.log
 android.log:

diff --git a/js/gen.sum b/js/gen.sum
diff --git a/test/testdata/.gitkeep b/test/testdata/.gitkeep
diff --git a/tool/berty-mini-local-helper/Makefile b/tool/berty-mini-local-helper/Makefile
@@ -17,6 +17,10 @@ log-stats:
 	@touch $(TMPDIR)/berty-mini-$(ID).log
 	cat $(TMPDIR)/berty-mini-$(ID).log | jq -r '.level + " " + .logger + " " + .msg + " " + .error' | sort | uniq -c
 
+.PHONY: share-qr
+share-qr:
+	berty --display-name=$(NAME) dev share-invite -d $(TMPDIR)/berty-mini-$(ID) --dev-channel
+
 .PHONY: watch-log-stats
 watch-log-stats:
 	watch -d make log-stats

diff --git a/...el/com_github_libp2p_go_openssl.BUILD.bzl → ...el/com_github_libp2p_go_openssl.BUILD.bzl b/...el/com_github_libp2p_go_openssl.BUILD.bzl → ...el/com_github_libp2p_go_openssl.BUILD.bzl
diff --git a/..._github_spacemonkeygo_openssl.BUILD.bazel → ..._github_spacemonkeygo_openssl.BUILD.bazel b/..._github_spacemonkeygo_openssl.BUILD.bazel → ..._github_spacemonkeygo_openssl.BUILD.bazel
diff --git a/build/ci/paths_changed → tool/build/ci/paths_changed b/build/ci/paths_changed → tool/build/ci/paths_changed
diff --git a/build/shell/check-java.sh → tool/build/shell/check-java.sh b/build/shell/check-java.sh → tool/build/shell/check-java.sh
diff --git a/build/shell/release-android.sh → tool/build/shell/release-android.sh b/build/shell/release-android.sh → tool/build/shell/release-android.sh
diff --git a/build/shell/release-ios.sh → tool/build/shell/release-ios.sh b/build/shell/release-ios.sh → tool/build/shell/release-ios.sh
diff --git a/build/shell/shortcut_build.sh → tool/build/shell/shortcut_build.sh b/build/shell/shortcut_build.sh → tool/build/shell/shortcut_build.sh
diff --git a/config/.gitkeep → tool/deployments/.gitkeep b/config/.gitkeep → tool/deployments/.gitkeep
diff --git a/deployments/rdvp-dev/Makefile → tool/deployments/rdvp-dev/Makefile b/deployments/rdvp-dev/Makefile → tool/deployments/rdvp-dev/Makefile
diff --git a/deployments/rdvp-dev/docker-compose.yml → tool/deployments/rdvp-dev/docker-compose.yml b/deployments/rdvp-dev/docker-compose.yml → tool/deployments/rdvp-dev/docker-compose.yml
diff --git a/deployments/watchtower/Makefile → tool/deployments/watchtower/Makefile b/deployments/watchtower/Makefile → tool/deployments/watchtower/Makefile
diff --git a/deployments/watchtower/docker-compose.yml → ...deployments/watchtower/docker-compose.yml b/deployments/watchtower/docker-compose.yml → ...deployments/watchtower/docker-compose.yml
diff --git a/githooks/pre-commit → tool/githooks/pre-commit b/githooks/pre-commit → tool/githooks/pre-commit
diff --git a/tool/go.mod b/tool/go.mod
diff --git a/deployments/.gitkeep → tool/go.sum b/deployments/.gitkeep → tool/go.sum
diff --git a/test/experiment/.gitignore → tool/test/experiment/.gitignore b/test/experiment/.gitignore → tool/test/experiment/.gitignore
diff --git a/test/experiment/BUILD.bazel → tool/test/experiment/BUILD.bazel b/test/experiment/BUILD.bazel → tool/test/experiment/BUILD.bazel
diff --git a/test/experiment/WORKSPACE → tool/test/experiment/WORKSPACE b/test/experiment/WORKSPACE → tool/test/experiment/WORKSPACE
diff --git a/test/experiment/dht/BUILD.bazel → tool/test/experiment/dht/BUILD.bazel b/test/experiment/dht/BUILD.bazel → tool/test/experiment/dht/BUILD.bazel
diff --git a/test/experiment/dht/Makefile → tool/test/experiment/dht/Makefile b/test/experiment/dht/Makefile → tool/test/experiment/dht/Makefile
diff --git a/test/experiment/dht/README.md → tool/test/experiment/dht/README.md b/test/experiment/dht/README.md → tool/test/experiment/dht/README.md
diff --git a/test/experiment/dht/dht.go → tool/test/experiment/dht/dht.go b/test/experiment/dht/dht.go → tool/test/experiment/dht/dht.go
diff --git a/...experiment/dht/src/bittorrent/BUILD.bazel → ...experiment/dht/src/bittorrent/BUILD.bazel b/...experiment/dht/src/bittorrent/BUILD.bazel → ...experiment/dht/src/bittorrent/BUILD.bazel
diff --git a/test/experiment/dht/src/bittorrent/dht.go → ...test/experiment/dht/src/bittorrent/dht.go b/test/experiment/dht/src/bittorrent/dht.go → ...test/experiment/dht/src/bittorrent/dht.go
diff --git a/test/experiment/dht/src/chord/BUILD.bazel → ...test/experiment/dht/src/chord/BUILD.bazel b/test/experiment/dht/src/chord/BUILD.bazel → ...test/experiment/dht/src/chord/BUILD.bazel
diff --git a/test/experiment/dht/src/chord/dht.go → tool/test/experiment/dht/src/chord/dht.go b/test/experiment/dht/src/chord/dht.go → tool/test/experiment/dht/src/chord/dht.go
diff --git a/test/experiment/dht/src/gnunet/BUILD.bazel → ...est/experiment/dht/src/gnunet/BUILD.bazel b/test/experiment/dht/src/gnunet/BUILD.bazel → ...est/experiment/dht/src/gnunet/BUILD.bazel
diff --git a/test/experiment/dht/src/gnunet/dht.go → tool/test/experiment/dht/src/gnunet/dht.go b/test/experiment/dht/src/gnunet/dht.go → tool/test/experiment/dht/src/gnunet/dht.go
diff --git a/test/experiment/dht/src/libp2p/BUILD.bazel → ...est/experiment/dht/src/libp2p/BUILD.bazel b/test/experiment/dht/src/libp2p/BUILD.bazel → ...est/experiment/dht/src/libp2p/BUILD.bazel
diff --git a/test/experiment/dht/src/libp2p/dht.go → tool/test/experiment/dht/src/libp2p/dht.go b/test/experiment/dht/src/libp2p/dht.go → tool/test/experiment/dht/src/libp2p/dht.go
diff --git a/test/experiment/dht/src/matrix/BUILD.bazel → ...est/experiment/dht/src/matrix/BUILD.bazel b/test/experiment/dht/src/matrix/BUILD.bazel → ...est/experiment/dht/src/matrix/BUILD.bazel
diff --git a/test/experiment/dht/src/matrix/Dockerfile → ...test/experiment/dht/src/matrix/Dockerfile b/test/experiment/dht/src/matrix/Dockerfile → ...test/experiment/dht/src/matrix/Dockerfile
diff --git a/test/experiment/dht/src/matrix/Makefile → tool/test/experiment/dht/src/matrix/Makefile b/test/experiment/dht/src/matrix/Makefile → tool/test/experiment/dht/src/matrix/Makefile
diff --git a/test/experiment/dht/src/matrix/client.go → .../test/experiment/dht/src/matrix/client.go b/test/experiment/dht/src/matrix/client.go → .../test/experiment/dht/src/matrix/client.go
diff --git a/test/experiment/dht/src/matrix/dht.go → tool/test/experiment/dht/src/matrix/dht.go b/test/experiment/dht/src/matrix/dht.go → tool/test/experiment/dht/src/matrix/dht.go
diff --git a/test/experiment/dht/src/matrix/dht_test.go → ...est/experiment/dht/src/matrix/dht_test.go b/test/experiment/dht/src/matrix/dht_test.go → ...est/experiment/dht/src/matrix/dht_test.go
diff --git a/...eriment/dht/src/matrix/docker-compose.yml → ...eriment/dht/src/matrix/docker-compose.yml b/...eriment/dht/src/matrix/docker-compose.yml → ...eriment/dht/src/matrix/docker-compose.yml
diff --git a/test/experiment/dht/src/opendht/BUILD.bazel → ...st/experiment/dht/src/opendht/BUILD.bazel b/test/experiment/dht/src/opendht/BUILD.bazel → ...st/experiment/dht/src/opendht/BUILD.bazel
diff --git a/test/experiment/dht/src/opendht/dht.go → tool/test/experiment/dht/src/opendht/dht.go b/test/experiment/dht/src/opendht/dht.go → tool/test/experiment/dht/src/opendht/dht.go
diff --git a/examples/.gitkeep → tool/test/experiment/dht/test/.gitkeep b/examples/.gitkeep → tool/test/experiment/dht/test/.gitkeep
diff --git a/test/experiment/dht/test/BUILD.bazel → tool/test/experiment/dht/test/BUILD.bazel b/test/experiment/dht/test/BUILD.bazel → tool/test/experiment/dht/test/BUILD.bazel
diff --git a/test/experiment/dht/test/basic_test.go → tool/test/experiment/dht/test/basic_test.go b/test/experiment/dht/test/basic_test.go → tool/test/experiment/dht/test/basic_test.go
diff --git a/test/experiment/farmer/.gitignore → tool/test/experiment/farmer/.gitignore b/test/experiment/farmer/.gitignore → tool/test/experiment/farmer/.gitignore
diff --git a/test/experiment/farmer/README.md → tool/test/experiment/farmer/README.md b/test/experiment/farmer/README.md → tool/test/experiment/farmer/README.md
diff --git a/test/experiment/farmer/farmer → tool/test/experiment/farmer/farmer b/test/experiment/farmer/farmer → tool/test/experiment/farmer/farmer
diff --git a/test/experiment/go.mod → tool/test/experiment/go.mod b/test/experiment/go.mod → tool/test/experiment/go.mod
diff --git a/test/experiment/go.sum → tool/test/experiment/go.sum b/test/experiment/go.sum → tool/test/experiment/go.sum
diff --git a/test/experiment/ipfs/Makefile → tool/test/experiment/ipfs/Makefile b/test/experiment/ipfs/Makefile → tool/test/experiment/ipfs/Makefile
diff --git a/test/experiment/ipfs/bootstrap → tool/test/experiment/ipfs/bootstrap b/test/experiment/ipfs/bootstrap → tool/test/experiment/ipfs/bootstrap
diff --git a/test/experiment/ipfs/pubsub-relay.sh → tool/test/experiment/ipfs/pubsub-relay.sh b/test/experiment/ipfs/pubsub-relay.sh → tool/test/experiment/ipfs/pubsub-relay.sh
diff --git a/test/experiment/network/libs/ansi.sh → tool/test/experiment/network/libs/ansi.sh b/test/experiment/network/libs/ansi.sh → tool/test/experiment/network/libs/ansi.sh
diff --git a/test/experiment/network/libs/shunit2.sh → tool/test/experiment/network/libs/shunit2.sh b/test/experiment/network/libs/shunit2.sh → tool/test/experiment/network/libs/shunit2.sh
diff --git a/test/experiment/network/libs/utils.sh → tool/test/experiment/network/libs/utils.sh b/test/experiment/network/libs/utils.sh → tool/test/experiment/network/libs/utils.sh
diff --git a/test/experiment/network/real/2nodes.sh → tool/test/experiment/network/real/2nodes.sh b/test/experiment/network/real/2nodes.sh → tool/test/experiment/network/real/2nodes.sh
diff --git a/test/experiment/network/real/Makefile → tool/test/experiment/network/real/Makefile b/test/experiment/network/real/Makefile → tool/test/experiment/network/real/Makefile
diff --git a/...xperiment/network/real/docker-compose.yml → ...xperiment/network/real/docker-compose.yml b/...xperiment/network/real/docker-compose.yml → ...xperiment/network/real/docker-compose.yml
diff --git a/...xperiment/network/simple/2nodes_1relay.sh → ...xperiment/network/simple/2nodes_1relay.sh b/...xperiment/network/simple/2nodes_1relay.sh → ...xperiment/network/simple/2nodes_1relay.sh
diff --git a/test/experiment/network/simple/Makefile → tool/test/experiment/network/simple/Makefile b/test/experiment/network/simple/Makefile → tool/test/experiment/network/simple/Makefile
diff --git a/...eriment/network/simple/docker-compose.yml → ...eriment/network/simple/docker-compose.yml b/...eriment/network/simple/docker-compose.yml → ...eriment/network/simple/docker-compose.yml
diff --git a/test/experiment/rancher/.env.example → tool/test/experiment/rancher/.env.example b/test/experiment/rancher/.env.example → tool/test/experiment/rancher/.env.example
diff --git a/test/experiment/rancher/docker-compose.yml → ...est/experiment/rancher/docker-compose.yml b/test/experiment/rancher/docker-compose.yml → ...est/experiment/rancher/docker-compose.yml
diff --git a/test/experiment/rancher/rancher-compose.yml → ...st/experiment/rancher/rancher-compose.yml b/test/experiment/rancher/rancher-compose.yml → ...st/experiment/rancher/rancher-compose.yml
diff --git a/test/experiment/scw/Makefile → tool/test/experiment/scw/Makefile b/test/experiment/scw/Makefile → tool/test/experiment/scw/Makefile
diff --git a/test/experiment/scw/add-service.yaml → tool/test/experiment/scw/add-service.yaml b/test/experiment/scw/add-service.yaml → tool/test/experiment/scw/add-service.yaml
diff --git a/test/experiment/scw/ansible.cfg → tool/test/experiment/scw/ansible.cfg b/test/experiment/scw/ansible.cfg → tool/test/experiment/scw/ansible.cfg
diff --git a/test/experiment/scw/berty.service → tool/test/experiment/scw/berty.service b/test/experiment/scw/berty.service → tool/test/experiment/scw/berty.service
diff --git a/test/experiment/scw/gen-identity.yaml → tool/test/experiment/scw/gen-identity.yaml b/test/experiment/scw/gen-identity.yaml → tool/test/experiment/scw/gen-identity.yaml
diff --git a/test/experiment/scw/hosts → tool/test/experiment/scw/hosts b/test/experiment/scw/hosts → tool/test/experiment/scw/hosts
diff --git a/test/experiment/scw/run-daemon.yaml → tool/test/experiment/scw/run-daemon.yaml b/test/experiment/scw/run-daemon.yaml → tool/test/experiment/scw/run-daemon.yaml
diff --git a/test/experiment/scw/run-relay.yaml → tool/test/experiment/scw/run-relay.yaml b/test/experiment/scw/run-relay.yaml → tool/test/experiment/scw/run-relay.yaml
diff --git a/test/experiment/dht/test/.gitkeep → tool/test/testdata/.gitkeep b/test/experiment/dht/test/.gitkeep → tool/test/testdata/.gitkeep