Remove embedded field Agent from selector.

Author: q-uint

gen/generator_test.go

@@ -48,7 +48,7 @@ func ExampleNewGenerator() {
 	// // Inc calls the "inc" method on the "test" canister.
 	// func (a TestAgent) Inc() (*idl.Nat, error) {
 	//     var r0 idl.Nat
-	//     if err := a.Agent.Call(
+	//     if err := a.Call(
 	//         a.CanisterId,
 	//         "inc",
 	//         []any{},
@@ -102,7 +102,7 @@ func ExampleNewGenerator_indirect() {
 	// // Inc calls the "inc" method on the "test" canister.
 	// func (a TestAgent) Inc() (*idl.Nat, error) {
 	//     var r0 idl.Nat
-	//     if err := a.Agent.Call(
+	//     if err := a.Call(
 	//         a.CanisterId,
 	//         "inc",
 	//         []any{},
@@ -115,7 +115,7 @@ func ExampleNewGenerator_indirect() {
 	//
 	// // IncCall creates an indirect representation of the "inc" method on the "test" canister.
 	// func (a TestAgent) IncCall() (*agent.CandidAPIRequest, error) {
-	//     return a.Agent.CreateCandidAPIRequest(
+	//     return a.CreateCandidAPIRequest(
 	//         agent.RequestTypeCall,
 	//         a.CanisterId,
 	//         "inc",
@@ -173,7 +173,7 @@ func ExampleNewGenerator_tags() {
 	// // Test calls the "test" method on the "test" canister.
 	// func (a TestAgent) Test() (*[]Resp, error) {
 	//     var r0 []Resp
-	//     if err := a.Agent.Call(
+	//     if err := a.Call(
 	//         a.CanisterId,
 	//         "test",
 	//         []any{},

gen/templates/agent.gotmpl

@@ -40,7 +40,7 @@ func (a {{ $.AgentName }}Agent) {{ .Name }}({{ range $i, $e := .ArgumentTypes }}
     {{ range $i, $e := .ReturnTypes -}}
         var r{{ $i }} {{ $e }}
     {{ end -}}
-    if err := a.Agent.{{ .Type }}(
+    if err := a.{{ .Type }}(
         a.CanisterId,
         "{{ .RawName }}",
         []any{{ "{" }}{{ range $i, $e := .ArgumentTypes }}{{ if $i }}, {{ end }}{{ $e.Name }}{{ end }}{{ "}" }},

gen/templates/agent_indirect.gotmpl

@@ -40,7 +40,7 @@ func (a {{ $.AgentName }}Agent) {{ .Name }}({{ range $i, $e := .ArgumentTypes }}
     {{ range $i, $e := .ReturnTypes -}}
         var r{{ $i }} {{ $e }}
     {{ end -}}
-    if err := a.Agent.{{ .Type }}(
+    if err := a.{{ .Type }}(
         a.CanisterId,
         "{{ .RawName }}",
         []any{{ "{" }}{{ range $i, $e := .ArgumentTypes }}{{ if $i }}, {{ end }}{{ $e.Name }}{{ end }}{{ "}" }},
@@ -53,7 +53,7 @@ func (a {{ $.AgentName }}Agent) {{ .Name }}({{ range $i, $e := .ArgumentTypes }}
 
 // {{ .Name }}{{ .Type }} creates an indirect representation of the "{{ .RawName }}" method on the "{{ $.CanisterName }}" canister.
 func (a {{ $.AgentName }}Agent) {{ .Name }}{{ .Type }}({{ range $i, $e := .ArgumentTypes }}{{ if $i }}, {{ end }}{{ $e.Name }} {{ $e.Type }}{{ end }}) (*agent.CandidAPIRequest, error) {
-    return a.Agent.CreateCandidAPIRequest(
+    return a.CreateCandidAPIRequest(
         agent.RequestType{{ .Type }},
         a.CanisterId,
         "{{ .RawName }}",{{ range $i, $e := .ArgumentTypes }}