5452b59a2e
* Update go-libp2p to v0.22.0 * Testing with go1.19 * build(deps): bump github.com/multiformats/go-multicodec Bumps [github.com/multiformats/go-multicodec](https://github.com/multiformats/go-multicodec) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/multiformats/go-multicodec/releases) - [Commits](https://github.com/multiformats/go-multicodec/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: github.com/multiformats/go-multicodec dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/ipld/go-car from 0.4.0 to 0.5.0 Bumps [github.com/ipld/go-car](https://github.com/ipld/go-car) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/ipld/go-car/releases) - [Commits](https://github.com/ipld/go-car/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: github.com/ipld/go-car dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.2 to 1.13.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.12.2...v1.13.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/hashicorp/go-hclog from 1.2.1 to 1.3.0 Bumps [github.com/hashicorp/go-hclog](https://github.com/hashicorp/go-hclog) from 1.2.1 to 1.3.0. - [Release notes](https://github.com/hashicorp/go-hclog/releases) - [Commits](https://github.com/hashicorp/go-hclog/compare/v1.2.1...v1.3.0) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-hclog dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/ipfs/go-ds-crdt from 0.3.6 to 0.3.7 Bumps [github.com/ipfs/go-ds-crdt](https://github.com/ipfs/go-ds-crdt) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/ipfs/go-ds-crdt/releases) - [Commits](https://github.com/ipfs/go-ds-crdt/compare/v0.3.6...v0.3.7) --- updated-dependencies: - dependency-name: github.com/ipfs/go-ds-crdt dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/urfave/cli/v2 from 2.10.2 to 2.14.1 Bumps [github.com/urfave/cli/v2](https://github.com/urfave/cli) from 2.10.2 to 2.14.1. - [Release notes](https://github.com/urfave/cli/releases) - [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/urfave/cli/compare/v2.10.2...v2.14.1) --- updated-dependencies: - dependency-name: github.com/urfave/cli/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/libp2p/go-libp2p-http from 0.3.0 to 0.4.0 Bumps [github.com/libp2p/go-libp2p-http](https://github.com/libp2p/go-libp2p-http) from 0.3.0 to 0.4.0. - [Release notes](https://github.com/libp2p/go-libp2p-http/releases) - [Commits](https://github.com/libp2p/go-libp2p-http/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: github.com/libp2p/go-libp2p-http dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/libp2p/go-libp2p-gorpc from 0.4.0 to 0.5.0 Bumps [github.com/libp2p/go-libp2p-gorpc](https://github.com/libp2p/go-libp2p-gorpc) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/libp2p/go-libp2p-gorpc/releases) - [Commits](https://github.com/libp2p/go-libp2p-gorpc/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: github.com/libp2p/go-libp2p-gorpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump contrib.go.opencensus.io/exporter/prometheus Bumps [contrib.go.opencensus.io/exporter/prometheus](https://github.com/census-ecosystem/opencensus-go-exporter-prometheus) from 0.4.1 to 0.4.2. - [Release notes](https://github.com/census-ecosystem/opencensus-go-exporter-prometheus/releases) - [Commits](https://github.com/census-ecosystem/opencensus-go-exporter-prometheus/compare/v0.4.1...v0.4.2) --- updated-dependencies: - dependency-name: contrib.go.opencensus.io/exporter/prometheus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/libp2p/go-libp2p-raft from 0.1.8 to 0.2.0 Bumps [github.com/libp2p/go-libp2p-raft](https://github.com/libp2p/go-libp2p-raft) from 0.1.8 to 0.2.0. - [Release notes](https://github.com/libp2p/go-libp2p-raft/releases) - [Commits](https://github.com/libp2p/go-libp2p-raft/compare/v0.1.8...v0.2.0) --- updated-dependencies: - dependency-name: github.com/libp2p/go-libp2p-raft dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump github.com/urfave/cli from 1.22.9 to 1.22.10 Bumps [github.com/urfave/cli](https://github.com/urfave/cli) from 1.22.9 to 1.22.10. - [Release notes](https://github.com/urfave/cli/releases) - [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/urfave/cli/compare/v1.22.9...v1.22.10) --- updated-dependencies: - dependency-name: github.com/urfave/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Fix checker/linter/staticcheck warnings Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
234 lines
7.0 KiB
Go
234 lines
7.0 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/ipfs-cluster/ipfs-cluster/api"
|
|
|
|
peer "github.com/libp2p/go-libp2p/core/peer"
|
|
)
|
|
|
|
func verifyOutput(t *testing.T, outStr string, trueStr string) {
|
|
outLines := strings.Split(outStr, "\n")
|
|
trueLines := strings.Split(trueStr, "\n")
|
|
if len(outLines) != len(trueLines) {
|
|
fmt.Printf("expected:\n-%s-\n\n\nactual:\n-%s-", trueStr, outStr)
|
|
t.Fatal("Number of output lines does not match expectation")
|
|
}
|
|
for i := range outLines {
|
|
if outLines[i] != trueLines[i] {
|
|
t.Errorf("Difference in sorted outputs (%d): %s vs %s", i, outLines[i], trueLines[i])
|
|
}
|
|
}
|
|
}
|
|
|
|
var simpleIpfs = `digraph cluster {
|
|
/* The nodes of the connectivity graph */
|
|
/* The cluster-service peers */
|
|
subgraph {
|
|
rank="min"
|
|
C0 [label=< <B> </B> <BR/> <B> Qm*eqhEhD </B> > group="QmUBuxVHoNNjfmNpTad36UeaFQv3gXAtCv9r6KhmeqhEhD" color="orange" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="box3d" peripheries="2" ]
|
|
C1 [label=< <B> </B> <BR/> <B> Qm*cgHDQJ </B> > group="QmV35LjbEGPfN7KfMAJp43VV2enwXqqQf5esx4vUcgHDQJ" color="darkorange3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="box3d" ]
|
|
C2 [label=< <B> </B> <BR/> <B> Qm*6MQmJu </B> > group="QmZ2ckU7G35MYyJgMTwMUnicsGqSy3YUxGBX7qny6MQmJu" color="darkorange3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="box3d" ]
|
|
}
|
|
|
|
/* The ipfs peers */
|
|
subgraph {
|
|
rank="max"
|
|
I0 [label=< <B> IPFS </B> <BR/> <B> Qm*N5LSsq </B> > group="QmPFKAGZbUjdzt8BBx8VTWCe9UeUQVcoqHFehSPzN5LSsq" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I1 [label=< <B> IPFS </B> <BR/> <B> Qm*R3DZDV </B> > group="QmXbiVZd93SLiu9TAm21F2y9JwGiFLydbEVkPBaMR3DZDV" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I2 [label=< <B> IPFS </B> <BR/> <B> Qm*wbBsuL </B> > group="QmbU7273zH6jxwDe2nqRmEm2rp5PpqP2xeQr2xCmwbBsuL" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
}
|
|
|
|
/* Edges representing active connections in the cluster */
|
|
/* The connections among cluster-service peers */
|
|
C0 -> C1
|
|
C0 -> C2
|
|
C1 -> C0
|
|
C1 -> C2
|
|
C2 -> C0
|
|
C2 -> C1
|
|
|
|
/* The connections between cluster peers and their ipfs daemons */
|
|
C0 -> I1
|
|
C1 -> I0
|
|
C2 -> I2
|
|
|
|
/* The swarm peer connections among ipfs daemons in the cluster */
|
|
I0 -> I1
|
|
I0 -> I2
|
|
I1 -> I0
|
|
I1 -> I2
|
|
I2 -> I1
|
|
I2 -> I0
|
|
}`
|
|
|
|
var (
|
|
pid1, _ = peer.Decode("QmUBuxVHoNNjfmNpTad36UeaFQv3gXAtCv9r6KhmeqhEhD")
|
|
pid2, _ = peer.Decode("QmV35LjbEGPfN7KfMAJp43VV2enwXqqQf5esx4vUcgHDQJ")
|
|
pid3, _ = peer.Decode("QmZ2ckU7G35MYyJgMTwMUnicsGqSy3YUxGBX7qny6MQmJu")
|
|
pid4, _ = peer.Decode("QmXbiVZd93SLiu9TAm21F2y9JwGiFLydbEVkPBaMR3DZDV")
|
|
pid5, _ = peer.Decode("QmPFKAGZbUjdzt8BBx8VTWCe9UeUQVcoqHFehSPzN5LSsq")
|
|
pid6, _ = peer.Decode("QmbU7273zH6jxwDe2nqRmEm2rp5PpqP2xeQr2xCmwbBsuL")
|
|
|
|
pid7, _ = peer.Decode("QmQsdAdCHs4PRLi5tcoLfasYppryqQENxgAy4b2aS8xccb")
|
|
pid8, _ = peer.Decode("QmVV2enwXqqQf5esx4v36UeaFQvFehSPzNfi8aaaaaanM8")
|
|
pid9, _ = peer.Decode("QmfCHNQ2vbUmAuJZhE2hEpgiJq4sL1XScWEKnUrVtWZdeD")
|
|
)
|
|
|
|
func TestSimpleIpfsGraphs(t *testing.T) {
|
|
cg := api.ConnectGraph{
|
|
ClusterID: pid1,
|
|
ClusterLinks: map[string][]peer.ID{
|
|
pid1.String(): {
|
|
pid2,
|
|
pid3,
|
|
},
|
|
pid2.String(): {
|
|
pid1,
|
|
pid3,
|
|
},
|
|
pid3.String(): {
|
|
pid1,
|
|
pid2,
|
|
},
|
|
},
|
|
IPFSLinks: map[string][]peer.ID{
|
|
pid4.String(): {
|
|
pid5,
|
|
pid6,
|
|
},
|
|
pid5.String(): {
|
|
pid4,
|
|
pid6,
|
|
},
|
|
pid6.String(): {
|
|
pid4,
|
|
pid5,
|
|
},
|
|
},
|
|
ClustertoIPFS: map[string]peer.ID{
|
|
pid1.String(): pid4,
|
|
pid2.String(): pid5,
|
|
pid3.String(): pid6,
|
|
},
|
|
}
|
|
buf := new(bytes.Buffer)
|
|
err := makeDot(cg, buf, false)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
verifyOutput(t, buf.String(), simpleIpfs)
|
|
}
|
|
|
|
var allIpfs = `digraph cluster {
|
|
/* The nodes of the connectivity graph */
|
|
/* The cluster-service peers */
|
|
subgraph {
|
|
rank="min"
|
|
C0 [label=< <B> </B> <BR/> <B> Qm*eqhEhD </B> > group="QmUBuxVHoNNjfmNpTad36UeaFQv3gXAtCv9r6KhmeqhEhD" color="orange" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="box3d" peripheries="2" ]
|
|
C1 [label=< <B> </B> <BR/> <B> Qm*cgHDQJ </B> > group="QmV35LjbEGPfN7KfMAJp43VV2enwXqqQf5esx4vUcgHDQJ" color="darkorange3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="box3d" ]
|
|
C2 [label=< <B> </B> <BR/> <B> Qm*6MQmJu </B> > group="QmZ2ckU7G35MYyJgMTwMUnicsGqSy3YUxGBX7qny6MQmJu" color="darkorange3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="box3d" ]
|
|
}
|
|
|
|
/* The ipfs peers */
|
|
subgraph {
|
|
rank="max"
|
|
I0 [label=< <B> IPFS </B> <BR/> <B> Qm*N5LSsq </B> > group="QmPFKAGZbUjdzt8BBx8VTWCe9UeUQVcoqHFehSPzN5LSsq" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I1 [label=< <B> IPFS </B> <BR/> <B> Qm*S8xccb </B> > group="QmQsdAdCHs4PRLi5tcoLfasYppryqQENxgAy4b2aS8xccb" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I2 [label=< <B> IPFS </B> <BR/> <B> Qm*aaanM8 </B> > group="QmVV2enwXqqQf5esx4v36UeaFQvFehSPzNfi8aaaaaanM8" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I3 [label=< <B> IPFS </B> <BR/> <B> Qm*R3DZDV </B> > group="QmXbiVZd93SLiu9TAm21F2y9JwGiFLydbEVkPBaMR3DZDV" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I4 [label=< <B> IPFS </B> <BR/> <B> Qm*wbBsuL </B> > group="QmbU7273zH6jxwDe2nqRmEm2rp5PpqP2xeQr2xCmwbBsuL" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
I5 [label=< <B> IPFS </B> <BR/> <B> Qm*tWZdeD </B> > group="QmfCHNQ2vbUmAuJZhE2hEpgiJq4sL1XScWEKnUrVtWZdeD" color="turquoise3" style="filled" colorscheme="x11" fontcolor="black" fontname="Arial" shape="cylinder" ]
|
|
}
|
|
|
|
/* Edges representing active connections in the cluster */
|
|
/* The connections among cluster-service peers */
|
|
C0 -> C1
|
|
C0 -> C2
|
|
C1 -> C0
|
|
C1 -> C2
|
|
C2 -> C0
|
|
C2 -> C1
|
|
|
|
/* The connections between cluster peers and their ipfs daemons */
|
|
C0 -> I3
|
|
C1 -> I0
|
|
C2 -> I4
|
|
|
|
/* The swarm peer connections among ipfs daemons in the cluster */
|
|
I0 -> I3
|
|
I0 -> I4
|
|
I0 -> I1
|
|
I0 -> I2
|
|
I0 -> I5
|
|
I3 -> I0
|
|
I3 -> I4
|
|
I3 -> I1
|
|
I3 -> I2
|
|
I3 -> I5
|
|
I4 -> I3
|
|
I4 -> I0
|
|
I4 -> I1
|
|
I4 -> I2
|
|
I4 -> I5
|
|
}`
|
|
|
|
func TestIpfsAllGraphs(t *testing.T) {
|
|
cg := api.ConnectGraph{
|
|
ClusterID: pid1,
|
|
ClusterLinks: map[string][]peer.ID{
|
|
pid1.String(): {
|
|
pid2,
|
|
pid3,
|
|
},
|
|
pid2.String(): {
|
|
pid1,
|
|
pid3,
|
|
},
|
|
pid3.String(): {
|
|
pid1,
|
|
pid2,
|
|
},
|
|
},
|
|
IPFSLinks: map[string][]peer.ID{
|
|
pid4.String(): {
|
|
pid5,
|
|
pid6,
|
|
pid7,
|
|
pid8,
|
|
pid9,
|
|
},
|
|
pid5.String(): {
|
|
pid4,
|
|
pid6,
|
|
pid7,
|
|
pid8,
|
|
pid9,
|
|
},
|
|
pid6.String(): {
|
|
pid4,
|
|
pid5,
|
|
pid7,
|
|
pid8,
|
|
pid9,
|
|
},
|
|
},
|
|
ClustertoIPFS: map[string]peer.ID{
|
|
pid1.String(): pid4,
|
|
pid2.String(): pid5,
|
|
pid3.String(): pid6,
|
|
},
|
|
}
|
|
|
|
buf := new(bytes.Buffer)
|
|
err := makeDot(cg, buf, true)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
verifyOutput(t, buf.String(), allIpfs)
|
|
}
|