Skip to content

Commit

Permalink
Adds Stringer interface to all types (#3568)
Browse files Browse the repository at this point in the history
* Adds Stringer interface to all types

* Moves a few types out of internal

* Moves MetaData to types

* Fixes build and regenerates

* Moves ipfspina nd reportcheck to types

* Fixes build

* Fixing build

* Moves a few types out of internal

* Upper case AppearanceTable

* Moved the last type to pkg

* Fixing build

* Trying to remove index.AddressRecord and index.AppearanceRecord as dups

* Removes index.AppearanceRecord in favor of types.SimpleAppRecord

* Cleaning

* Removes the idea of goOutput folder for auto-gen

* Fix Typos in Comments (#3569)

* modified readme.md in bin

* cacheing to caching example fix

* test commit again

* Fix typos

* Fix typos

* Fix typos

---------

Co-authored-by: Gary Snipes <[email protected]>

* Revert "Fix Typos in Comments (#3569)" (#3570)

This reverts commit 1b95049.

* Cleaning

---------

Co-authored-by: Gary Snipes <[email protected]>
Co-authored-by: Gary Snipes <[email protected]>
  • Loading branch information
3 people authored Apr 10, 2024
1 parent 5f5af78 commit 7f8de31
Show file tree
Hide file tree
Showing 209 changed files with 1,803 additions and 1,216 deletions.
17 changes: 16 additions & 1 deletion docs/content/api/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2690,11 +2690,12 @@ paths:
schema:
properties:
data:
description: Produces <a href="/data-model/accounts/#appearance">Appearance</a>, <a href="/data-model/admin/#chunkaddress">ChunkAddress</a>, <a href="/data-model/admin/#chunkbloom">ChunkBloom</a>, <a href="/data-model/admin/#chunkindex">ChunkIndex</a>, <a href="/data-model/admin/#chunkpinreport">ChunkPinReport</a>, <a href="/data-model/admin/#chunkrecord">ChunkRecord</a>, <a href="/data-model/admin/#chunkstats">ChunkStats</a>, <a href="/data-model/admin/#ipfspin">IpfsPin</a>, <a href="/data-model/admin/#manifest">Manifest</a> or <a href="/data-model/admin/#reportcheck">ReportCheck</a> data. Corresponds to the <a href="/chifra/admin/#chifra-chunks">chifra chunks</a> command line.
description: Produces <a href="/data-model/accounts/#appearance">Appearance</a>, <a href="/data-model/accounts/#appearancetable">AppearanceTable</a>, <a href="/data-model/admin/#chunkaddress">ChunkAddress</a>, <a href="/data-model/admin/#chunkbloom">ChunkBloom</a>, <a href="/data-model/admin/#chunkindex">ChunkIndex</a>, <a href="/data-model/admin/#chunkpinreport">ChunkPinReport</a>, <a href="/data-model/admin/#chunkrecord">ChunkRecord</a>, <a href="/data-model/admin/#chunkstats">ChunkStats</a>, <a href="/data-model/admin/#ipfspin">IpfsPin</a>, <a href="/data-model/admin/#manifest">Manifest</a> or <a href="/data-model/admin/#reportcheck">ReportCheck</a> data. Corresponds to the <a href="/chifra/admin/#chifra-chunks">chifra chunks</a> command line.
type: array
items:
oneOf:
- $ref: "#/components/schemas/appearance"
- $ref: "#/components/schemas/appearanceTable"
- $ref: "#/components/schemas/chunkAddress"
- $ref: "#/components/schemas/chunkBloom"
- $ref: "#/components/schemas/chunkIndex"
Expand Down Expand Up @@ -3011,6 +3012,20 @@ components:
type: string
format: datetime
description: "the timestamp as a date (calculated)"
appearanceTable:
description: "an appearance table for an address"
type: object
properties:
AddressRecord:
type: object
items:
$ref: "#/components/schemas/addrRecord"
description: "the address record for these appearances"
Appearances:
type: array
items:
$ref: "#/components/schemas/appRecord"
description: "all the appearances for this address"
monitor:
description: "a local file indicating a user's interest in an address. Includes caches for reconicilations, transactions, and appearances as well as an optional association to named account"
type: object
Expand Down
1 change: 1 addition & 0 deletions docs/content/chifra/admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ Notes:
Data models produced by this tool:

- [appearance](/data-model/accounts/#appearance)
- [appearancetable](/data-model/accounts/#appearancetable)
- [chunkaddress](/data-model/admin/#chunkaddress)
- [chunkbloom](/data-model/admin/#chunkbloom)
- [chunkindex](/data-model/admin/#chunkindex)
Expand Down
15 changes: 15 additions & 0 deletions docs/content/data-model/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,21 @@ Appearances consist of the following fields:
| timestamp | the timestamp for this appearance | timestamp |
| date | the timestamp as a date (calculated) | datetime |

## AppearanceTable



The following commands produce and manage AppearanceTables:

- [chifra chunks](/chifra/admin/#chifra-chunks)

AppearanceTables consist of the following fields:

| Field | Description | Type |
| ------------- | ---------------------------------------- | ----------- |
| AddressRecord | the address record for these appearances | AddrRecord |
| Appearances | all the appearances for this address | AppRecord[] |

## Monitor

A Monitor is a list of [Appearances](/data-model/accounts/#appearance) associated with a given
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/abis.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
abis "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -79,7 +79,7 @@ func GetAbisOptions(args []string) (*AbisOptions, error) {
return &opts, nil
}

func (opts *AbisOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *AbisOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Abis(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/blocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
blocks "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -96,7 +95,7 @@ func GetBlocksOptions(args []string) (*BlocksOptions, error) {
return &opts, nil
}

func (opts *BlocksOptions) Query() ([]types.SimpleBlock[string], *rpc.MetaData, error) {
func (opts *BlocksOptions) Query() ([]types.SimpleBlock[string], *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Blocks(&buffer); err != nil {
logger.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/chunks.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
chunks "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -98,7 +98,7 @@ func GetChunksOptions(args []string) (*ChunksOptions, error) {
return &opts, nil
}

func (opts *ChunksOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *ChunksOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Chunks(&buffer); err != nil {
logger.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
config "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -79,7 +79,7 @@ func GetConfigOptions(args []string) (*ConfigOptions, error) {
return &opts, nil
}

func (opts *ConfigOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *ConfigOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Config(&buffer); err != nil {
logger.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
export "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -108,7 +108,7 @@ func GetExportOptions(args []string) (*ExportOptions, error) {
return &opts, nil
}

func (opts *ExportOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *ExportOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Export(&buffer); err != nil {
logger.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
initPkg "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -73,7 +73,7 @@ func GetInitOptions(args []string) (*InitOptions, error) {
return &opts, nil
}

func (opts *InitOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *InitOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Init(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
list "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -81,7 +80,7 @@ func GetListOptions(args []string) (*ListOptions, error) {
return &opts, nil
}

func (opts *ListOptions) Query() ([]types.SimpleAppearance, *rpc.MetaData, error) {
func (opts *ListOptions) Query() ([]types.SimpleAppearance, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.List(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"log"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
logs "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -72,7 +71,7 @@ func GetLogsOptions(args []string) (*LogsOptions, error) {
return &opts, nil
}

func (opts *LogsOptions) Query() ([]types.SimpleLog, *rpc.MetaData, error) {
func (opts *LogsOptions) Query() ([]types.SimpleLog, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Logs(&buffer); err != nil {
logger.Fatal(err)
Expand Down
6 changes: 2 additions & 4 deletions sdk/go/meta.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package sdk

import (
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
)
import "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"

func GetMetaData() (*rpc.MetaData, error) {
func GetMetaData() (*types.MetaData, error) {
unused := BlocksOptions{
BlockIds: []string{"1"},
Hashes: true,
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/monitors.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"log"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
monitors "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -79,7 +79,7 @@ func GetMonitorsOptions(args []string) (*MonitorsOptions, error) {
return &opts, nil
}

func (opts *MonitorsOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *MonitorsOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Monitors(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/names.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
names "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -86,7 +85,7 @@ func GetNamesOptions(args []string) (*NamesOptions, error) {
return &opts, nil
}

func (opts *NamesOptions) Query() ([]types.SimpleName, *rpc.MetaData, error) {
func (opts *NamesOptions) Query() ([]types.SimpleName, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Names(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/receipts.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"log"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
receipts "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -70,7 +69,7 @@ func GetReceiptsOptions(args []string) (*ReceiptsOptions, error) {
return &opts, nil
}

func (opts *ReceiptsOptions) Query() ([]types.SimpleReceipt, *rpc.MetaData, error) {
func (opts *ReceiptsOptions) Query() ([]types.SimpleReceipt, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Receipts(&buffer); err != nil {
logger.Fatal(err)
Expand Down
11 changes: 3 additions & 8 deletions sdk/go/result.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
package sdk

import "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"

// type abisResult struct {
// Data []bool `json:"data"`
// Meta rpc.MetaData `json:"meta"`
// }
import "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"

type Result[T any] struct {
Data []T `json:"data"`
Meta rpc.MetaData `json:"meta"`
Data []T `json:"data"`
Meta types.MetaData `json:"meta"`
}
3 changes: 1 addition & 2 deletions sdk/go/slurp.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"strings"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
slurp "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -97,7 +96,7 @@ func GetSlurpOptions(args []string) (*SlurpOptions, error) {
return &opts, nil
}

func (opts *SlurpOptions) Query() ([]types.SimpleSlurp, *rpc.MetaData, error) {
func (opts *SlurpOptions) Query() ([]types.SimpleSlurp, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Slurp(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
state "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -91,7 +90,7 @@ func GetStateOptions(args []string) (*StateOptions, error) {
return &opts, nil
}

func (opts *StateOptions) Query() ([]types.SimpleState, *rpc.MetaData, error) {
func (opts *StateOptions) Query() ([]types.SimpleState, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.State(&buffer); err != nil {
logger.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
status "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -82,7 +82,7 @@ func GetStatusOptions(args []string) (*StatusOptions, error) {
return &opts, nil
}

func (opts *StatusOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *StatusOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Status(&buffer); err != nil {
logger.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions sdk/go/tokens.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
tokens "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
)
Expand Down Expand Up @@ -83,7 +83,7 @@ func GetTokensOptions(args []string) (*TokensOptions, error) {
return &opts, nil
}

func (opts *TokensOptions) Query() ([]bool, *rpc.MetaData, error) {
func (opts *TokensOptions) Query() ([]bool, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Tokens(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/traces.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"log"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
traces "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -72,7 +71,7 @@ func GetTracesOptions(args []string) (*TracesOptions, error) {
return &opts, nil
}

func (opts *TracesOptions) Query() ([]types.SimpleTrace, *rpc.MetaData, error) {
func (opts *TracesOptions) Query() ([]types.SimpleTrace, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Traces(&buffer); err != nil {
logger.Fatal(err)
Expand Down
3 changes: 1 addition & 2 deletions sdk/go/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"strings"

"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
transactions "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/sdk"
// EXISTING_CODE
Expand Down Expand Up @@ -88,7 +87,7 @@ func GetTransactionsOptions(args []string) (*TransactionsOptions, error) {
return &opts, nil
}

func (opts *TransactionsOptions) Query() ([]types.SimpleTransaction, *rpc.MetaData, error) {
func (opts *TransactionsOptions) Query() ([]types.SimpleTransaction, *types.MetaData, error) {
buffer := bytes.Buffer{}
if err := opts.Transactions(&buffer); err != nil {
logger.Fatal(err)
Expand Down
Loading

0 comments on commit 7f8de31

Please sign in to comment.