-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate with lightwalletd and librustzcash #16
Closed
Closed
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
c99f9a3
Add data access layer for dataDb
gmale 2c0966a
Create synchronizer and add layer of business logic onto the data layer
gmale 986ee50
Switch to JUnit 5
gmale 5915ad3
Create CompactBlockDownloader, iterate on business logic using new JU…
gmale 9448f43
Integrate with dataDb init commands and grpc service updates.
gmale 13642d6
Create CompactBlockProcessor and refine responsibilities of collabora…
gmale 84b8756
Create ActiveTransactionManager to monitor active transactions
gmale e668946
Iterate and refine send and active transaction behavior
gmale bfdd093
Create mock synchronizer to help with driving the UI.
gmale 21f09fa
Fix bugs
gmale 1892e4d
Add conversion logic and extensions for consistency and correctness
gmale 913ecb4
Twig: Refactor to be much more useful.
gmale 37c9cf7
Add additional logging to mock synchronizer
gmale df9f020
Add address information to notes query and other cleanup
gmale c5e5941
Prevent change from being returned in transaction queries
gmale 09de20c
Remove unused things and document limits of Junit 5 usage
gmale 56fada2
Improve logic and behavior during app startup.
gmale ed5e9c0
Add a layer of logic for bubbling up errors
gmale d38c348
Update the logic for determining balance
gmale c7d85f2
Cleanup
gmale 764455d
Clean up data API
gmale File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
def protoSrcDir = "src/main/proto" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NOTE: I've put zero energy into cleaning this file because it will be deleted once #15 is merged. |
||
def protoDestDir = "build/generated/source/wire" | ||
//def protoSrcDir = "src/main/proto" | ||
//def protoDestDir = "build/generated/source/grpc" | ||
def protoIncludeDir = "build/extracted-include-protos/main" | ||
def jniSrcDir = "src/main/rust" | ||
def jniDestDir = "build/rust/target" | ||
|
||
|
@@ -11,36 +12,64 @@ def libArm64Dir = "src/main/jniLibs/arm64-v8a" | |
def libArmeabiFile = "build/rust/target/armv7-linux-androideabi/release/$libFile" | ||
def libArmeabiDir = "src/main/jniLibs/armeabi-v7a" | ||
|
||
buildscript { | ||
dependencies { | ||
classpath("com.squareup.wire:wire-compiler:2.2.0") | ||
} | ||
repositories { | ||
mavenCentral() | ||
} | ||
} | ||
//buildscript { | ||
// dependencies { | ||
// classpath("com.squareup.wire:wire-compiler:2.2.0") | ||
// } | ||
// repositories { | ||
// mavenCentral() | ||
// } | ||
//} | ||
|
||
tasks.register("generateProtobufClasses") { | ||
doFirst { | ||
println("**** CREATING PROTOS ****") | ||
delete(protoDestDir) | ||
mkdir(protoDestDir) | ||
} | ||
description = "Generate Java classes from protocol buffer (.proto) schema files for use with Square's Wire library" | ||
//tasks.register("generateGrpcClasses") { | ||
// doFirst { | ||
// println("**** CREATING PROTOS ****") | ||
// delete(protoDestDir) | ||
// mkdir(protoDestDir) | ||
// } | ||
// description = "Generate Java classes from protocol buffer (.proto) schema files for use with grpc" | ||
// | ||
// fileTree(dir: protoSrcDir, include: '**/*.proto').each { File file -> | ||
// doLast { | ||
// javaexec { | ||
// main = "com.squareup.wire.WireCompiler" | ||
// classpath = buildscript.configurations.classpath | ||
// args = ["--proto_path=$protoSrcDir", "--java_out=$protoDestDir", file.path] | ||
// } | ||
// } | ||
// } | ||
// inputs.files(fileTree(dir: protoSrcDir, include: '**/*.proto')) | ||
// outputs.files(fileTree(dir: protoDestDir, include: '**')) | ||
//} | ||
|
||
fileTree(dir: protoSrcDir, include: '**/*.proto').each { File file -> | ||
doLast { | ||
javaexec { | ||
main = "com.squareup.wire.WireCompiler" | ||
classpath = buildscript.configurations.classpath | ||
args = ["--proto_path=$protoSrcDir", "--java_out=$protoDestDir", file.path] | ||
} | ||
} | ||
//tasks.register("generateProtobufClasses") { | ||
// doFirst { | ||
// println("**** CREATING PROTOS ****") | ||
// delete(protoDestDir) | ||
// mkdir(protoDestDir) | ||
// } | ||
// description = "Generate Java classes from protocol buffer (.proto) schema files for use with Square's Wire library" | ||
// | ||
// fileTree(dir: protoSrcDir, include: '**/*.proto').each { File file -> | ||
// doLast { | ||
// javaexec { | ||
// main = "com.squareup.wire.WireCompiler" | ||
// classpath = buildscript.configurations.classpath | ||
// args = ["--proto_path=$protoSrcDir", "--java_out=$protoDestDir", file.path] | ||
// } | ||
// } | ||
// } | ||
// inputs.files(fileTree(dir: protoSrcDir, include: '**/*.proto')) | ||
// outputs.files(fileTree(dir: protoDestDir, include: '**')) | ||
//} | ||
tasks.register("includeDirBugFix") { | ||
doFirst { | ||
mkdir(protoIncludeDir) | ||
} | ||
inputs.files(fileTree(dir: protoSrcDir, include: '**/*.proto')) | ||
outputs.files(fileTree(dir: protoDestDir, include: '**')) | ||
} | ||
|
||
// TODO: run these in paralell with the worker API: https://guides.gradle.org/using-the-worker-api/ | ||
// note: this will require modifying the build script and having 3 separate calls | ||
tasks.register("generateJniLibs") { | ||
doFirst { | ||
println("**** CREATING JNI LIBS ****") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#Thu Nov 08 13:10:14 EST 2018 | ||
#Tue Mar 12 10:04:58 EDT 2019 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip |
55 changes: 0 additions & 55 deletions
55
src/androidTest/java/cash/z/wallet/sdk/dao/ComplactBlockDaoTest.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be
src/generated/source/grpc
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
as far as I can tell, it is.