Skip to content
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.

Sign up for GitHub

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

websocket variant of query endpoint #3936

Merged
merged 69 commits into from
Jan 15, 2020
Merged

websocket variant of query endpoint #3936

Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
b134aea
minor improvements on websocket and add websocketIT
lima-da Dec 18, 2019
cfe29b0
merge in master
lima-da Dec 18, 2019
807c14a
add it for websocket, and support config args
lima-da Dec 19, 2019
2771f85
Merge in Master
lima-da Dec 19, 2019
51fb690
add one more test case
lima-da Dec 19, 2019
fcf5e14
make ws config optional
lima-da Dec 20, 2019
9ae56db
Merge branch 'master' of github.com:digital-asset/daml into json-webs…
lima-da Dec 20, 2019
78a8d17
avoid fromTryCatchNonFatal when derivative already exists
S11001001 Dec 20, 2019
792a55f
spelling and missing type parameter
S11001001 Dec 20, 2019
f7ef4ea
use richer Matchers in WebsocketServiceIntegrationTest
S11001001 Dec 20, 2019
a0dfab3
scalafmt
S11001001 Dec 20, 2019
b0fa48f
IDEs may love braces but we don't
S11001001 Dec 20, 2019
6f4e81b
utility for simplifying FanOutShape2s; use in ContractsService
S11001001 Dec 23, 2019
44d2392
split matSecondOut into generalization; make compile again
S11001001 Dec 24, 2019
eebcae4
match matSecondOut utility with standard utility methods
S11001001 Dec 24, 2019
5ecba29
spelling
S11001001 Dec 24, 2019
3b05dc8
getCreatesAndArchivesSince doesn't need to query the transaction boun…
S11001001 Dec 24, 2019
f2c026b
boolean newtype utility
S11001001 Dec 24, 2019
4a34b4c
split up transactionMessageHandler into components
S11001001 Dec 30, 2019
75c59af
decodeAndParsePayload passes through the Jwt
S11001001 Dec 30, 2019
b3dcb27
Merge commit 'f04ce1a3c898f5713d6fd6f1d3f56ced7b1c4646' into 3880-web…
S11001001 Dec 30, 2019
0dc9260
clean up config and default WS config
S11001001 Jan 1, 2020
aac4687
take multiple template IDs for insertDeleteStepSource
S11001001 Jan 1, 2020
7ae5b7d
replace websocket return with {errors, add, remove}, based on acsFoll…
S11001001 Jan 1, 2020
20f9566
parse ValuePredicate in websocket
S11001001 Jan 2, 2020
d14175f
remove unused lfvToJson
S11001001 Jan 2, 2020
4ee3246
nominal internal state for emitted WS steps-and-errors
S11001001 Jan 2, 2020
9433580
missing copyright headers
S11001001 Jan 2, 2020
ea75469
add filtering to convertFilterContracts
S11001001 Jan 2, 2020
9ff70dc
add step conflation to websocket output
S11001001 Jan 2, 2020
cf992ca
move conflation to static function
S11001001 Jan 2, 2020
0cb1444
rename /transactions endpoint to /contracts/searchForever
S11001001 Jan 2, 2020
eca83ba
empty requests are not allowed; numConns is per-service
S11001001 Jan 2, 2020
caf0786
option for GetCreatesAndArchiveSince to not terminate; use in Websock…
S11001001 Jan 2, 2020
1b94379
start of searchForever documentation
S11001001 Jan 2, 2020
707cea0
stub searchForever longer test
S11001001 Jan 2, 2020
386ad59
use valueOr
S11001001 Jan 2, 2020
2422271
don't run all other tests again with WebsocketServiceIntegrationTest
S11001001 Jan 3, 2020
735422e
start of websocket delta test
S11001001 Jan 8, 2020
3438c76
Merge commit 'a043b09375814a64c7e5823a1c549f5931e68c87' into 3880-web…
S11001001 Jan 9, 2020
5b52999
solve init order problem with AbstractHttpServiceIntegrationTestFuns
S11001001 Jan 9, 2020
da7dbc3
full flow test, fails for lack of create/exercise yet
S11001001 Jan 9, 2020
edf8969
passing full flow test
S11001001 Jan 9, 2020
f199e95
full documentation examples
S11001001 Jan 9, 2020
1469ea7
rename add/remove to created/archived
S11001001 Jan 9, 2020
4383b1c
cleaner NewBoolean.Named
S11001001 Jan 9, 2020
a3df010
document heartbeats
S11001001 Jan 9, 2020
a1360b5
document subprotocols for searchForever
S11001001 Jan 10, 2020
798f918
note about the tests mysteriously terminating
S11001001 Jan 10, 2020
427704d
ensure create has happened before attempting query in tests
S11001001 Jan 10, 2020
5e10fcc
reorganize multi-step WS test so its states and assertions are clearer
S11001001 Jan 10, 2020
7cb76bc
filter out heartbeats in raw string tests
S11001001 Jan 10, 2020
917cbc7
factor out ContractDelta
S11001001 Jan 10, 2020
fe89d28
make exercisePayload easier to read
S11001001 Jan 10, 2020
2d3448c
filter out heartbeats in conversation test
S11001001 Jan 10, 2020
9c9d1a2
remove type lambda
S11001001 Jan 10, 2020
131e0f7
accept chunked queries
S11001001 Jan 10, 2020
8e1b92f
add changelog
S11001001 Jan 10, 2020
b9ce77a
Merge commit '006aa9b60816e13b4587b565f3348bc438507074' into 3880-web…
S11001001 Jan 10, 2020
140ef02
adapt to #3991 template ID strings
S11001001 Jan 10, 2020
a32e105
adapt to #3971 argument -> payload
S11001001 Jan 10, 2020
d87cfcb
fix create command for test (string template ID redux)
S11001001 Jan 15, 2020
0c585da
Merge commit '536d6a3f9468c8fd1461872c73717ec2798d80c2' into 3880-web…
S11001001 Jan 15, 2020
d757518
adapt to #4014 ResolveTemplateId change
S11001001 Jan 15, 2020
af7d548
update copyright headers
S11001001 Jan 15, 2020
42dc6b9
rebuild WS example output to match latest changes
S11001001 Jan 15, 2020
094668b
SeqOps is not a safe name
S11001001 Jan 15, 2020
c6b58c0
don't need breakOut anymore
S11001001 Jan 15, 2020
c3e5537
use util library form of partitionMap
S11001001 Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
spelling
  • Loading branch information
@S11001001
S11001001 committed Dec 24, 2019
commit 5ecba295603614649711aaf657720337c4dd1930
2 changes: 1 addition & 1 deletion ledger-service/http-json/src/main/scala/com/digitalasset/http/ContractsService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class ContractsService(
}
}

// we store create arguments as JASON in DB, that is why it is `domain.ActiveContract[JsValue]` in the result
// we store create arguments as JSON in DB, that is why it is `domain.ActiveContract[JsValue]` in the result
def searchDb(dao: dbbackend.ContractDao, fetch: ContractsFetch)(
jwt: Jwt,
party: domain.Party,
Expand Down