Merge pull request #656 from vEpiphyte/remove_blobfile

Remove blobfile since it will not be used for backing axons
2lambda123 · Feb 9, 2018 · ea504cc · ea504cc
2 parents b27ae38 + 34e7df6
commit ea504cc
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 534 deletions.
diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -77,5 +77,4 @@
 s_datamodel.rebuildTlib()
 
 # load any modules which register dyndeps aliases...
-# ( order matters...)
-import synapse.axon  # synapse.axon brings in synapse.cortex's dyndep registration.
+import synapse.cortex
diff --git a/synapse/axon.py b/synapse/axon.py
@@ -16,7 +16,6 @@
 import synapse.lib.const as s_const
 import synapse.lib.config as s_config
 import synapse.lib.msgpack as s_msgpack
-import synapse.lib.blobfile as s_blobfile
 
 # for backward compat (HashSet moved from this module to synapse.lib.hashset )
 from synapse.lib.hashset import *

diff --git a/synapse/exc.py b/synapse/exc.py
@@ -207,17 +207,6 @@ class BadAtomFile(SynErr):
     '''
     pass
 
-class BadBlobFile(SynErr):
-    '''
-    Raised when there is an internal issue with a blobfile
-    '''
-    pass
-class BlobFileIsClone(SynErr):
-    '''
-    Raised when there is a write operation on a blobfile which is a clone.
-    '''
-    pass
-
 class IsFini(Exception): pass
 
 class RetnTimeout(SynErr):

diff --git a/synapse/lib/blobfile.py b/synapse/lib/blobfile.py