From a59e9a28db560b7a3e7cc23109bf5a03ce3e6abc Mon Sep 17 00:00:00 2001 From: Miguel Victoria Date: Tue, 9 Apr 2024 14:16:59 +0200 Subject: [PATCH] Add register --- .../providers/profile.gno | 0 .../r/demo/teritori/providers/profiles.gno | 66 +++++++++++++++++++ .../providers/profiles_test.gno | 0 .../r/demo/teritori/registry/registry.gno | 27 ++++++++ .../demo/teritori/registry/registry_test.gno | 22 +++++++ .../worx_aggregator/providers/profiles.gno | 39 ----------- .../r/demo/teritori/worx_aggregator/worx.gno | 27 ++++---- 7 files changed, 131 insertions(+), 50 deletions(-) rename examples/gno.land/r/demo/teritori/{worx_aggregator => }/providers/profile.gno (100%) create mode 100644 examples/gno.land/r/demo/teritori/providers/profiles.gno rename examples/gno.land/r/demo/teritori/{worx_aggregator => }/providers/profiles_test.gno (100%) create mode 100644 examples/gno.land/r/demo/teritori/registry/registry.gno create mode 100644 examples/gno.land/r/demo/teritori/registry/registry_test.gno delete mode 100644 examples/gno.land/r/demo/teritori/worx_aggregator/providers/profiles.gno diff --git a/examples/gno.land/r/demo/teritori/worx_aggregator/providers/profile.gno b/examples/gno.land/r/demo/teritori/providers/profile.gno similarity index 100% rename from examples/gno.land/r/demo/teritori/worx_aggregator/providers/profile.gno rename to examples/gno.land/r/demo/teritori/providers/profile.gno diff --git a/examples/gno.land/r/demo/teritori/providers/profiles.gno b/examples/gno.land/r/demo/teritori/providers/profiles.gno new file mode 100644 index 00000000000..7cac0e00eda --- /dev/null +++ b/examples/gno.land/r/demo/teritori/providers/profiles.gno @@ -0,0 +1,66 @@ +package provider + +import ( + "std" + "gno.land/p/demo/avl" + "gno.land/p/demo/ufmt" + "gno.land/r/demo/teritori/registry" +) + +var profiles avl.Tree + +func init() { + registry.Register("profiles", RegisterHandler) +} + + +func Get(dataName string, addr std.Address) interface{} { + if dataName != "profile"{ + panic("invalid dataname") + } + profile:=getProfile(addr) + + return profile.ToString() +} + +func SupportedTypes() []string{ + return []string{"profile"} +} + +func UpsertProfile(field string, value string){ + caller := std.GetOrigCaller() + profile := getProfile(caller) + profile.SetField(field, value) + profiles.Set(caller.String(), profile) +} + + +func getProfile(addr std.Address ) *Profile { + profile, found:=profiles.Get(addr.String()) + if !found{ + return &Profile{} + } + + return profile.(*Profile) +} + +func RegisterHandler(functionName string, args ...interface{}) interface{} { + switch functionName { + case "get": + if len(args) != 2{ + panic("invalid number of arguments") + } + dataname := args[0].(string) + address := args[1].(std.Address) + return Get(dataname,address) + case "supportedTypes": + if len(args) != 0{ + panic("invalid number of arguments") + } + dataname := args[0].(string) + address := args[1].(std.Address) + return SupportedTypes() + default: + panic("invalid function name") + } +} \ No newline at end of file diff --git a/examples/gno.land/r/demo/teritori/worx_aggregator/providers/profiles_test.gno b/examples/gno.land/r/demo/teritori/providers/profiles_test.gno similarity index 100% rename from examples/gno.land/r/demo/teritori/worx_aggregator/providers/profiles_test.gno rename to examples/gno.land/r/demo/teritori/providers/profiles_test.gno diff --git a/examples/gno.land/r/demo/teritori/registry/registry.gno b/examples/gno.land/r/demo/teritori/registry/registry.gno new file mode 100644 index 00000000000..faa6175fd9a --- /dev/null +++ b/examples/gno.land/r/demo/teritori/registry/registry.gno @@ -0,0 +1,27 @@ +package registry + +import ( + "gno.land/p/demo/avl" + "std" +) + +var callbacks avl.Tree +type FunctionCB func(functionName string, args ...interface{}) interface{} + +func Register(id string, callback FunctionCB){ + _,exists:=callbacks.Get(id) + if exists{ + panic("A callback already exists for the id") + } + + callbacks.Set(id, callback) +} + +func Exec(id string, functionName string, args ...interface{}) interface{} { + cb, ok:= callbacks.Get(id) + if !ok{ + panic("Callback not found") + } + function := cb.(FunctionCB) + return function(functionName, args) +} \ No newline at end of file diff --git a/examples/gno.land/r/demo/teritori/registry/registry_test.gno b/examples/gno.land/r/demo/teritori/registry/registry_test.gno new file mode 100644 index 00000000000..bb167cd1752 --- /dev/null +++ b/examples/gno.land/r/demo/teritori/registry/registry_test.gno @@ -0,0 +1,22 @@ +package registry + +import ( + "std" + "testing" + + "gno.land/p/demo/avl" + "gno.land/p/demo/testutils" + "strings" +) + +func TestGetProfile(t *testing.T) { + user1 := testutils.TestAddress("user1") + std.TestSetOrigCaller(user1) + functionID:="SOMEID" + var cb functionCB = func(args ...interface{})[]interface{}{ + //t.Errorf("dataType",dataType) + return nil + } + Register(functionID, cb) + Exec(functionID) +} \ No newline at end of file diff --git a/examples/gno.land/r/demo/teritori/worx_aggregator/providers/profiles.gno b/examples/gno.land/r/demo/teritori/worx_aggregator/providers/profiles.gno deleted file mode 100644 index aef780696d1..00000000000 --- a/examples/gno.land/r/demo/teritori/worx_aggregator/providers/profiles.gno +++ /dev/null @@ -1,39 +0,0 @@ -package provider - -import ( - "std" - "gno.land/p/demo/avl" - "gno.land/p/demo/ufmt" -) - -var profiles avl.Tree - -func Get(dataName string, addr std.Address) string { - if dataName != "profile"{ - panic("invalid dataname") - } - profile:=getProfile(addr) - - return profile.ToString() -} - -func SupportedTypes() []string{ - return []string{"profile"} -} - -func UpsertProfile(field string, value string){ - caller := std.GetOrigCaller() - profile := getProfile(caller) - profile.SetField(field, value) - profiles.Set(caller.String(), profile) -} - - -func getProfile(addr std.Address ) *Profile { - profile, found:=profiles.Get(addr.String()) - if !found{ - return &Profile{} - } - - return profile.(*Profile) -} \ No newline at end of file diff --git a/examples/gno.land/r/demo/teritori/worx_aggregator/worx.gno b/examples/gno.land/r/demo/teritori/worx_aggregator/worx.gno index 2a0f39e756a..adf9f70e829 100644 --- a/examples/gno.land/r/demo/teritori/worx_aggregator/worx.gno +++ b/examples/gno.land/r/demo/teritori/worx_aggregator/worx.gno @@ -2,13 +2,9 @@ package worx_aggregator import( "gno.land/p/demo/avl" + "gno.land/r/demo/teritori/registry" + "std" ) - -//interface WorxDataProvider { -// Get(dataName string, addr std.Address) any -// SupportedTypes() []string -//} - var admin std.Address var dataProviders []WorxDataProvider var dataTypeToDataProvider avl.Tree @@ -20,18 +16,22 @@ func Get(dataType string, addr std.Address) []any { if len(dataProviders) == 0 { panic("there is not dataprovider configured for that datatype") } - for d := range dataProviders { - all = append(all, d.Get(dataType, addr)...) + for registerID := range dataProviders { + all = append(all, getFromRealm(registerID,dataType, addr)...) } return all } -func RegisterDataProvider(dp WorxDataProvider) { +func RegisterDataProvider(registerRootID string) { assertAdmin() - for supp := range dp.SupportedTypes() { + supportedTypes := registry.Exec(registerRootID, "supportedTypes") + + supportedTypesSlice := supportedTypes.[[]interface{}] + for supp := range supportedTypesSlice { + suppStr:= supp.(string) providers := dataTypeToDataProvider.Get(supp) - providers = append(providers, dp) + providers = append(providers, registerRootID) dataTypeToDataProvider.set(supp, providers) } } @@ -40,4 +40,9 @@ func assertAdmin(){ if (std.PrevRealm().Addr() != admin) { panic("unathorized") } +} + +func getFromRealm(registerRootID string,dataType string, address std.Address) []any { + getRegisterID := registerRootID + return registry.Exec(getRegisterID, "get", dataType, address) } \ No newline at end of file