Skip to content

Commit 1653be6

Browse files
authored
rename namespaces and remove "ipfs" alias for "p2p" (#283)
Previously, we called these foo-ns. Now we just call them foo (the fact that they're "namespaces" is implicit. This way, the path component always matches the multicodec name (for both multiaddr and other path types).
1 parent 6bca206 commit 1653be6

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

table.csv

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ md4, multihash, 0xd4, draft,
8181
md5, multihash, 0xd5, draft,
8282
decred-block, ipld, 0xe0, draft, Decred Block
8383
decred-tx, ipld, 0xe1, draft, Decred Tx
84-
ipld-ns, namespace, 0xe2, draft, IPLD path
85-
ipfs-ns, namespace, 0xe3, draft, IPFS path
86-
swarm-ns, namespace, 0xe4, draft, Swarm path
87-
ipns-ns, namespace, 0xe5, draft, IPNS path
84+
ipld, namespace, 0xe2, draft, IPLD path
85+
ipfs, namespace, 0xe3, draft, IPFS path
86+
swarm, namespace, 0xe4, draft, Swarm path
87+
ipns, namespace, 0xe5, draft, IPNS path
8888
zeronet, namespace, 0xe6, draft, ZeroNet site address
8989
secp256k1-pub, key, 0xe7, draft, Secp256k1 public key (compressed)
9090
dnslink, namespace, 0xe8, permanent, DNSLink path
@@ -109,7 +109,6 @@ utp, multiaddr, 0x012e, draft,
109109
unix, multiaddr, 0x0190, permanent,
110110
thread, multiaddr, 0x0196, draft, Textile Thread
111111
p2p, multiaddr, 0x01a5, permanent, libp2p
112-
ipfs, multiaddr, 0x01a5, draft, libp2p (deprecated)
113112
https, multiaddr, 0x01bb, draft,
114113
onion, multiaddr, 0x01bc, draft,
115114
onion3, multiaddr, 0x01bd, draft,

validate.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,10 @@
44
import sys
55
import re
66

7-
# We have some duplicates
8-
ALIAS_TABLE = [
9-
{"ipfs", "p2p"},
10-
]
11-
127
def check(fname='table.csv'):
138
class CheckError(Exception):
149
pass
1510

16-
aliases = {}
17-
for nameset in ALIAS_TABLE:
18-
for name in nameset:
19-
aliases[name] = nameset
20-
2111
success = True
2212
with open(fname) as table:
2313
tablereader = csv.reader(table, strict=True, skipinitialspace=False)
@@ -84,11 +74,6 @@ class CheckError(Exception):
8474
names[name] = code
8575

8676
if code in codes:
87-
dup = codes[code]
88-
if name in aliases:
89-
if dup in aliases[name]:
90-
# Skip aliased names
91-
continue
9277
raise CheckError(
9378
f"found duplicate for code {hex(code)} "
9479
f"for '{codes[code]}' and '{name}'"

0 commit comments

Comments
 (0)