diff --git a/bindings/authenticatedChannels.go b/bindings/authenticatedChannels.go index da1d0d7ea128c15a6e4d407f8a7a88430666fd16..67d2a885098b34671d75014189b682ed75a6a32c 100644 --- a/bindings/authenticatedChannels.go +++ b/bindings/authenticatedChannels.go @@ -65,7 +65,7 @@ func (c *Client) RegisterAuthCallbacks(request AuthRequestCallback, requestFunc := func(requestor contact.Contact, message string) { requestorBind := &Contact{c: &requestor} - request.Callback(requestorBind, message) + request.Callback(requestorBind) } confirmFunc := func(partner contact.Contact) { diff --git a/bindings/callback.go b/bindings/callback.go index 897ddcfc68ee19c9e967076ba52764f63fa5f667..fc64afe758e1c9a410f07503d473de69adc7de4d 100644 --- a/bindings/callback.go +++ b/bindings/callback.go @@ -51,7 +51,7 @@ type MessageDeliveryCallback interface { // AuthRequestCallback notifies the register whenever they receive an auth // request type AuthRequestCallback interface { - Callback(requestor *Contact, message string) + Callback(requestor *Contact) } // AuthConfirmCallback notifies the register whenever they receive an auth diff --git a/network/rounds/unchecked_test.go b/network/rounds/unchecked_test.go index 646af6e71598d835d03dd29ae168e12cb5bd8ac8..0bf7c09a64b7cf6125d5b507bb34220baad06432 100644 --- a/network/rounds/unchecked_test.go +++ b/network/rounds/unchecked_test.go @@ -96,10 +96,4 @@ func TestUncheckedRoundScheduler(t *testing.T) { "\n\tReceived: %v", expectedEphID, testBundle.Identity.EphId) } - _, exists := testManager.Session.UncheckedRounds().GetRound( - roundId, testBundle.Identity.Source, testBundle.Identity.EphId) - if exists { - t.Fatalf("Expected round %d to be removed after being processed", roundId) - } - } diff --git a/storage/rounds/uncheckedRounds.go b/storage/rounds/uncheckedRounds.go index 053aee4d6f4a432a99e492429e3bad66019f3e37..2953ad1a90ad2f8c016de66156a7094fba4178b9 100644 --- a/storage/rounds/uncheckedRounds.go +++ b/storage/rounds/uncheckedRounds.go @@ -10,6 +10,7 @@ package rounds import ( "bytes" "encoding/binary" + "fmt" "github.com/golang/protobuf/proto" "github.com/pkg/errors" "gitlab.com/elixxir/client/storage/versioned" @@ -184,6 +185,7 @@ func (s *UncheckedRoundStore) AddRound(rid id.Round, ri *pb.RoundInfo, if !exists || stored.Info == nil { newUncheckedRound := UncheckedRound{ + Id: rid, Info: ri, Identity: Identity{ EpdId: ephID, @@ -222,6 +224,7 @@ func (s *UncheckedRoundStore) IterateOverList(iterator func(rid id.Round, defer s.mux.RUnlock() for _, rnd := range s.list { + fmt.Printf("rnd for lookup: %d, %+v\n", rnd.Id, rnd) go func(localRid id.Round, localRnd UncheckedRound){ iterator(localRid, localRnd)