From ca63b969e96f9a0f9d838128d9f517db1ef2397d Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 26 Mar 2020 12:25:46 +0000 Subject: [PATCH] Update gomatrixserverlib --- go.mod | 2 +- go.sum | 2 ++ roomserver/input/events.go | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 9f87a2ae9..46722a19f 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200318135427-31631a9ef51f github.com/matrix-org/go-sqlite3-js v0.0.0-20200304164012-aa524245b658 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 - github.com/matrix-org/gomatrixserverlib v0.0.0-20200326103633-7eddb3e7c417 + github.com/matrix-org/gomatrixserverlib v0.0.0-20200326122246-d2837c742cb1 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 github.com/mattn/go-sqlite3 v2.0.2+incompatible diff --git a/go.sum b/go.sum index 9e2f51f03..e5492fa45 100644 --- a/go.sum +++ b/go.sum @@ -148,6 +148,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200326100820-9f045b94b090 h1:El github.com/matrix-org/gomatrixserverlib v0.0.0-20200326100820-9f045b94b090/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/gomatrixserverlib v0.0.0-20200326103633-7eddb3e7c417 h1:U7jPTrhaf80iCugHiwZLxmyMsamGb8du7pHBspHFhzg= github.com/matrix-org/gomatrixserverlib v0.0.0-20200326103633-7eddb3e7c417/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200326122246-d2837c742cb1 h1:0DzAiIcStISdyiu49apzl58aDa9YqVblvdf0XSFsPK0= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200326122246-d2837c742cb1/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A= github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8= diff --git a/roomserver/input/events.go b/roomserver/input/events.go index 52b411574..ab2bbe1cd 100644 --- a/roomserver/input/events.go +++ b/roomserver/input/events.go @@ -97,12 +97,10 @@ func processRoomEvent( ) (eventID string, err error) { // Parse and validate the event JSON event := input.Event - fmt.Println("Starting processRoomEvent") // Check that the event passes authentication checks and work out the numeric IDs for the auth events. authEventNIDs, err := checkAuthEvents(ctx, db, event.Event, input.AuthEventIDs) if err != nil { - fmt.Println("checkAuthEvents:", err) return } @@ -113,7 +111,6 @@ func processRoomEvent( ) // On error OR event with the transaction already processed/processesing if err != nil || eventID != "" { - fmt.Println("db.GetTransactionEventID:", err) return } } @@ -121,7 +118,6 @@ func processRoomEvent( // Store the event roomNID, stateAtEvent, err := db.StoreEvent(ctx, event.Event, input.TransactionID, authEventNIDs) if err != nil { - fmt.Println("db.StoreEvent:", err) return } @@ -137,7 +133,6 @@ func processRoomEvent( // Lets calculate one. err = calculateAndSetState(ctx, db, input, roomNID, &stateAtEvent, event.Event) if err != nil { - fmt.Println("calculateAndSetState:", err) return } }