From 8f67dd583d86155440e7905ae23083a9fea42f72 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:44:11 +0100 Subject: [chore] deinterface the typeutils.Converter and update to use state structure (#2217) * update typeconverter to use state structure * deinterface the typeutils.TypeConverter -> typeutils.Converter * finish copying over old type converter code comments * fix cherry-pick merge issues, fix tests pointing to old typeutils interface type still --- internal/federation/federator.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/federation/federator.go') diff --git a/internal/federation/federator.go b/internal/federation/federator.go index ad6db8ff7..1d1df4714 100644 --- a/internal/federation/federator.go +++ b/internal/federation/federator.go @@ -59,7 +59,7 @@ type federator struct { db db.DB federatingDB federatingdb.DB clock pub.Clock - typeConverter typeutils.TypeConverter + converter *typeutils.Converter transportController transport.Controller mediaManager *media.Manager actor pub.FederatingActor @@ -67,15 +67,15 @@ type federator struct { } // NewFederator returns a new federator -func NewFederator(state *state.State, federatingDB federatingdb.DB, transportController transport.Controller, typeConverter typeutils.TypeConverter, mediaManager *media.Manager) Federator { - dereferencer := dereferencing.NewDereferencer(state, typeConverter, transportController, mediaManager) +func NewFederator(state *state.State, federatingDB federatingdb.DB, transportController transport.Controller, converter *typeutils.Converter, mediaManager *media.Manager) Federator { + dereferencer := dereferencing.NewDereferencer(state, converter, transportController, mediaManager) clock := &Clock{} f := &federator{ db: state.DB, federatingDB: federatingDB, clock: &Clock{}, - typeConverter: typeConverter, + converter: converter, transportController: transportController, mediaManager: mediaManager, Dereferencer: dereferencer, -- cgit v1.2.3