Skip to content

Commit f15036d

Browse files
committed
make tests for 3-to-4 not use docker (and work)
1 parent 4a4f038 commit f15036d

File tree

3 files changed

+228
-63
lines changed

3 files changed

+228
-63
lines changed

Godeps/_workspace/src/github.com/ipfs/ipfs-update/test-dist/testnew.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ipfs-3-to-4/migration/migration.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (m Migration) Revert(opts migrate.Options) error {
157157
}
158158

159159
log.Log("reverting stored ipns records")
160-
if err := rewriteKeys(newds, oldds, "ipns", oldKeyFunc("/ipns/"), validateNewKey, transferIpnsEntries); err != nil {
160+
if err := rewriteKeys(newds, oldds, "ipns", oldKeyFunc("/ipns/"), validateNewKey, revertIpnsEntries); err != nil {
161161
return err
162162
}
163163

@@ -307,3 +307,17 @@ func transferIpnsEntries(ds dstore.Datastore, oldk dstore.Key, data []byte, mkke
307307
dsk := dstore.NewKey("/ipns/" + base32.RawStdEncoding.EncodeToString([]byte(oldk.String()[6:])))
308308
return ds.Put(dsk, data)
309309
}
310+
311+
func revertIpnsEntries(ds dstore.Datastore, oldk dstore.Key, data []byte, mkkey mkKeyFunc) error {
312+
if len(oldk.String()) != 61 {
313+
log.Log(" - skipping malformed ipns record: %q", oldk)
314+
return nil
315+
}
316+
dec, err := base32.RawStdEncoding.DecodeString(oldk.String()[6:])
317+
if err != nil {
318+
return err
319+
}
320+
321+
dsk := dstore.NewKey("/ipns/" + string(dec))
322+
return ds.Put(dsk, data)
323+
}

0 commit comments

Comments
 (0)