Merge pull request #67 from libp2p/marco-marshal-limit-config-properly

Implement `json.Marshaler` interface for LimitConfig

p2p/host/resource-manager/limit_config_test.go

@@ -1,6 +1,8 @@
 package rcmgr
 
 import (
+	"bytes"
+	"encoding/json"
 	"os"
 	"testing"
 
@@ -50,4 +52,11 @@ func TestLimitConfigParser(t *testing.T) {
 	require.NoError(t, err)
 	require.Contains(t, cfg.Peer, peerID)
 	require.Equal(t, int64(4097), cfg.Peer[peerID].Memory)
+
+	// Roundtrip
+	jsonBytes, err := json.Marshal(&cfg)
+	require.NoError(t, err)
+	cfgAfterRoundTrip, err := readLimiterConfigFromJSON(bytes.NewReader(jsonBytes), defaults)
+	require.NoError(t, err)
+	require.Equal(t, cfg, cfgAfterRoundTrip)
 }

p2p/host/resource-manager/limit_defaults.go

@@ -1,6 +1,7 @@
 package rcmgr
 
 import (
+	"encoding/json"
 	"math"
 
 	"github.com/libp2p/go-libp2p-core/peer"
@@ -136,6 +137,23 @@ type LimitConfig struct {
 	Stream BaseLimit `json:",omitempty"`
 }
 
+func (cfg *LimitConfig) MarshalJSON() ([]byte, error) {
+	// we want to marshal the encoded peer id
+	encodedPeerMap := make(map[string]BaseLimit, len(cfg.Peer))
+	for p, v := range cfg.Peer {
+		encodedPeerMap[peer.Encode(p)] = v
+	}
+
+	type Alias LimitConfig
+	return json.Marshal(&struct {
+		*Alias
+		Peer map[string]BaseLimit `json:",omitempty"`
+	}{
+		Alias: (*Alias)(cfg),
+		Peer:  encodedPeerMap,
+	})
+}
+
 func (cfg *LimitConfig) Apply(c LimitConfig) {
 	cfg.System.Apply(c.System)
 	cfg.Transient.Apply(c.Transient)