Raise copyright years

[nncp.git] / src / cmd / nncp-cfgmin / main.go

diff --git a/src/cmd/nncp-cfgmin/main.go b/src/cmd/nncp-cfgmin/main.go
index d2730eba221cf841878ed635389e7425a12224bc..bc50792325ab4757c80b85667f4fb7e7f2c4be40 100644 (file)
--- a/src/cmd/nncp-cfgmin/main.go
+++ b/src/cmd/nncp-cfgmin/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,8 +24,8 @@ import (
        "log"
        "os"
 
-       "go.cypherpunks.ru/nncp/v4"
-       "gopkg.in/yaml.v2"
+       "github.com/hjson/hjson-go"
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -41,6 +41,7 @@ func main() {
                version  = flag.Bool("version", false, "Print version information")
                warranty = flag.Bool("warranty", false, "Print warranty information")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -52,30 +53,30 @@ func main() {
                return
        }
 
-       ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false)
+       ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false, false, false)
        if err != nil {
                log.Fatalln("Error during initialization:", err)
        }
 
-       cfg := nncp.CfgYAML{
+       cfg := nncp.CfgJSON{
                Spool: ctx.Spool,
                Log:   ctx.LogPath,
-               Neigh: make(map[string]nncp.NodeYAML),
+               Neigh: make(map[string]nncp.NodeJSON),
        }
        for _, node := range ctx.Neigh {
                var noisePub *string
                if node.NoisePub != nil {
-                       np := nncp.ToBase32(node.NoisePub[:])
+                       np := nncp.Base32Codec.EncodeToString(node.NoisePub[:])
                        noisePub = &np
                }
-               cfg.Neigh[node.Name] = nncp.NodeYAML{
+               cfg.Neigh[node.Name] = nncp.NodeJSON{
                        Id:       node.Id.String(),
-                       ExchPub:  nncp.ToBase32(node.ExchPub[:]),
-                       SignPub:  nncp.ToBase32(node.SignPub[:]),
+                       ExchPub:  nncp.Base32Codec.EncodeToString(node.ExchPub[:]),
+                       SignPub:  nncp.Base32Codec.EncodeToString(node.SignPub[:]),
                        NoisePub: noisePub,
                }
        }
-       raw, err := yaml.Marshal(&cfg)
+       raw, err := hjson.Marshal(&cfg)
        if err != nil {
                panic(err)
        }