@@ -6,50 +6,16 @@ import (
66 "fmt"
77 "time"
88
9- /*
10- bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11- bserv "github.com/ipfs/go-ipfs/blockservice"
12- offline "github.com/ipfs/go-ipfs/exchange/offline"
13- */
14-
159 block "github.com/ipfs/go-block-format"
1610 cbor "github.com/ipfs/go-ipld-cbor"
1711 recbor "github.com/polydawn/refmt/cbor"
1812 atlas "github.com/polydawn/refmt/obj/atlas"
1913
20- //ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore"
2114 cid "github.com/ipfs/go-cid"
2215 mh "github.com/multiformats/go-multihash"
2316 cbg "github.com/whyrusleeping/cbor-gen"
2417)
2518
26- // THIS IS ALL TEMPORARY CODE
27-
28- /*
29- func init() {
30- cbor.RegisterCborType(cbor.BigIntAtlasEntry)
31- cbor.RegisterCborType(Node{})
32- cbor.RegisterCborType(Pointer{})
33-
34- kvAtlasEntry := atlas.BuildEntry(KV{}).Transform().TransformMarshal(
35- atlas.MakeMarshalTransformFunc(func(kv KV) ([]interface{}, error) {
36- return []interface{}{kv.Key, kv.Value}, nil
37- })).TransformUnmarshal(
38- atlas.MakeUnmarshalTransformFunc(func(v []interface{}) (KV, error) {
39- return KV{
40- Key: v[0].(string),
41- Value: v[1],
42- }, nil
43- })).Complete()
44- cbor.RegisterCborType(kvAtlasEntry)
45- }
46- */
47-
48- type CborIpldStore struct {
49- Blocks blocks
50- Atlas * atlas.Atlas
51- }
52-
5319func NewSerializationError (err error ) error {
5420 return SerializationError {err }
5521}
@@ -71,6 +37,20 @@ func (se SerializationError) Is(o error) bool {
7137 return ok
7238}
7339
40+ // CborIpldStore is the ipld store interface required by the hamt.
41+ type CborIpldStore interface {
42+ Get (ctx context.Context , c cid.Cid , out interface {}) error
43+ Put (ctx context.Context , v interface {}) (cid.Cid , error )
44+ }
45+
46+ // BasicCborIpldStore is a simple CborIpldStore made from wrapping a blockstore.
47+ type BasicCborIpldStore struct {
48+ Blocks blocks
49+ Atlas * atlas.Atlas
50+ }
51+
52+ var _ CborIpldStore = & BasicCborIpldStore {}
53+
7454type blocks interface {
7555 GetBlock (context.Context , cid.Cid ) (block.Block , error )
7656 AddBlock (block.Block ) error
@@ -93,8 +73,8 @@ func (bs *bswrapper) AddBlock(blk block.Block) error {
9373 return bs .bs .Put (blk )
9474}
9575
96- func CSTFromBstore (bs Blockstore ) * CborIpldStore {
97- return & CborIpldStore {
76+ func CSTFromBstore (bs Blockstore ) * BasicCborIpldStore {
77+ return & BasicCborIpldStore {
9878 Blocks : & bswrapper {bs },
9979 }
10080}
@@ -120,11 +100,11 @@ func (mb *mockBlocks) AddBlock(b block.Block) error {
120100 return nil
121101}
122102
123- func NewCborStore () * CborIpldStore {
124- return & CborIpldStore {Blocks : newMockBlocks ()}
103+ func NewCborStore () * BasicCborIpldStore {
104+ return & BasicCborIpldStore {Blocks : newMockBlocks ()}
125105}
126106
127- func (s * CborIpldStore ) Get (ctx context.Context , c cid.Cid , out interface {}) error {
107+ func (s * BasicCborIpldStore ) Get (ctx context.Context , c cid.Cid , out interface {}) error {
128108 ctx , cancel := context .WithTimeout (ctx , time .Second * 10 )
129109 defer cancel ()
130110
@@ -138,7 +118,6 @@ func (s *CborIpldStore) Get(ctx context.Context, c cid.Cid, out interface{}) err
138118 if err := cu .UnmarshalCBOR (bytes .NewReader (blk .RawData ())); err != nil {
139119 return NewSerializationError (err )
140120 }
141-
142121 return nil
143122 }
144123
@@ -153,7 +132,7 @@ type cidProvider interface {
153132 Cid () cid.Cid
154133}
155134
156- func (s * CborIpldStore ) Put (ctx context.Context , v interface {}) (cid.Cid , error ) {
135+ func (s * BasicCborIpldStore ) Put (ctx context.Context , v interface {}) (cid.Cid , error ) {
157136 mhType := uint64 (mh .BLAKE2B_MIN + 31 )
158137 mhLen := - 1
159138 codec := uint64 (cid .DagCBOR )
@@ -171,7 +150,7 @@ func (s *CborIpldStore) Put(ctx context.Context, v interface{}) (cid.Cid, error)
171150 if ok {
172151 buf := new (bytes.Buffer )
173152 if err := cm .MarshalCBOR (buf ); err != nil {
174- return cid .Undef , NewSerializationError ( err )
153+ return cid .Undef , err
175154 }
176155
177156 pref := cid.Prefix {
@@ -212,3 +191,7 @@ func (s *CborIpldStore) Put(ctx context.Context, v interface{}) (cid.Cid, error)
212191
213192 return nd .Cid (), nil
214193}
194+
195+ func (s * BasicCborIpldStore ) GetBlock (ctx context.Context , cid cid.Cid ) (block.Block , error ) {
196+ return s .Blocks .GetBlock (ctx , cid )
197+ }
0 commit comments