synapse 2.154.1__py311-none-any.whl → 2.156.0__py311-none-any.whl

synapse/tests/test_lib_grammar.py

@@ -685,6 +685,16 @@ Queries = [
     'reverse(inet:ipv4)',
     'reverse(inet:ipv4=1.2.3.4)',
     'reverse(*$form=$valu)',
+    'inet:ipv4 --+> *',
+    'file:bytes <+-- *',
+    'inet:asn <+("edge")- *',
+    'inet:asn -("edge")+> *',
+    'file:bytes -(($foobar, $bizbaz))+> ($biz, $boz)=lol',
+    'media:news <+((neato, burrito))- inet:fqdn',
+    'inet:ipv4 <+(*)- media:news',
+    'media:news -(*)+> inet:fqdn',
+    'inet:ipv4 <+(*)- *',
+    'media:news -(*)+> *'
 ]
 
 # Generated with print_parse_list below
@@ -704,7 +714,7 @@ _ParseResults = [
     'Query: [EditTagPropSet: [TagProp: [TagName: [VarValue: [Const: tag]], VarValue: [Const: tagprop]], Const: =, VarValue: [Const: valu]]]',
     'Query: [VarEvalOper: [FuncCall: [VarDeref: [VarValue: [Const: lib], Const: print], CallArgs: [FormatString: [Const: ip=, FuncCall: [VarDeref: [VarValue: [Const: node], Const: repr], CallArgs: [], CallKwargs: []], Const:  asn=, RelPropValue: [Const: asn], Const:  .seen=, UnivPropValue: [Const: .seen], Const:  foo=, TagValue: [TagName: [Const: foo]], Const:  , ExprNode: [RelPropValue: [Const: asn], Const: =, Const: 5]]], CallKwargs: []]]]',
     'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 45.79.131.138], FormPivot: [AbsProp: inet:flow], isjoin=False, FiltOper: [Const: -, OrCond: [RelPropCond: [RelPropValue: [RelProp: [Const: dst:port]], Const: =, Const: 444], RelPropCond: [RelPropValue: [RelProp: [Const: dst:port]], Const: =, Const: 80]]]]',
-    'Query: [LiftPropBy: [Const: media:news, Const: =, Const: 0c7f7267d3b62432cb0d7d0e9d3108a4], N1Walk: [Const: refs, Const: inet:ipv4]]',
+    'Query: [LiftPropBy: [Const: media:news, Const: =, Const: 0c7f7267d3b62432cb0d7d0e9d3108a4], N1Walk: [Const: refs, Const: inet:ipv4], isjoin=False]',
     'Query: [SetVarOper: [Const: foo, DollarExpr: [Const: 2]], Return: [DollarExpr: [ExprNode: [VarValue: [Const: foo], Const: +, DollarExpr: [Const: 1]]]]]',
     'Query: [SetVarOper: [Const: foo, DollarExpr: [Const: 2]], Return: [DollarExpr: [ExprNode: [VarValue: [Const: foo], Const: -, DollarExpr: [Const: 1]]]]]',
     'Query: [Return: [DollarExpr: [ExprNode: [DollarExpr: [Const: 2], Const: +, DollarExpr: [Const: 1]]]]]',
@@ -722,8 +732,8 @@ _ParseResults = [
     'Query: [SetVarOper: [Const: p, Const: bar], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditTagAdd: [TagName: [Const: foo, Const: bar], Const: =, DollarExpr: [Const: 0]], Return: [DollarExpr: [ExprNode: [TagValue: [TagName: [Const: foo, VarValue: [Const: p]]], Const: <, ExprNode: [DollarExpr: [Const: 4], Const: -, DollarExpr: [Const: 1]]]]]]',
     'Query: [EditNodeAdd: [FormName: [Const: inet:asn], Const: =, Const: 1], EditNodeAdd: [FormName: [Const: inet:asn], Const: =, Const: 2], EditEdgeAdd: [Const: foo), SubQuery: [Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4]]]]]',
     'Query: [LiftPropBy: [Const: inet:asn, Const: <, DollarExpr: [Const: 2]]]',
-    'Query: [LiftProp: [Const: inet:asn], N2Walk: [Const: foo), Const: *]]',
-    'Query: [LiftProp: [Const: inet:asn], N2Walk: [List: [Const: foo), Const: bar()], Const: *]]',
+    'Query: [LiftProp: [Const: inet:asn], N2Walk: [Const: foo), Const: *], isjoin=False]',
+    'Query: [LiftProp: [Const: inet:asn], N2Walk: [List: [Const: foo), Const: bar()], Const: *], isjoin=False]',
     'Query: [Emit: [VarValue: [Const: foo]], Stop: []]',
     'Query: [TryCatch: [Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: asdf]], CatchBlock: [Const: TypeError, Const: err, Query: []]]]',
     'Query: [TryCatch: [Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: asdf]], CatchBlock: [Const: FooBar, Const: err, Query: []], CatchBlock: [Const: *, Const: err, Query: []]]]',
@@ -739,10 +749,10 @@ _ParseResults = [
     'Query: [LiftProp: [Const: inet:ipv4], N2WalkNPivo: [], isjoin=False]',
     'Query: [LiftPropBy: [Const: inet:fqdn, Const: =, Const: woot.com], EditEdgeAdd: [Const: refs, SubQuery: [Query: [LiftProp: [Const: media:news]]]]]',
     'Query: [LiftPropBy: [Const: inet:fqdn, Const: =, Const: woot.com], EditEdgeAdd: [Const: refs, SubQuery: [Query: [LiftProp: [Const: media:news]]]]]',
-    'Query: [SetVarOper: [Const: refs, Const: refs], LiftProp: [Const: media:news], N1Walk: [VarValue: [Const: refs], Const: *], FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
-    'Query: [SetVarOper: [Const: refs, Const: refs], LiftProp: [Const: media:news], N2Walk: [VarValue: [Const: refs], List: [Const: inet:ipv4, Const: inet:ipv6]], FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
-    'Query: [LiftProp: [Const: media:news], N1Walk: [Const: refs, Const: *], FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
-    'Query: [LiftProp: [Const: media:news], N2Walk: [Const: refs, VarValue: [Const: bar]], FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
+    'Query: [SetVarOper: [Const: refs, Const: refs], LiftProp: [Const: media:news], N1Walk: [VarValue: [Const: refs], Const: *], isjoin=False, FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
+    'Query: [SetVarOper: [Const: refs, Const: refs], LiftProp: [Const: media:news], N2Walk: [VarValue: [Const: refs], List: [Const: inet:ipv4, Const: inet:ipv6]], isjoin=False, FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
+    'Query: [LiftProp: [Const: media:news], N1Walk: [Const: refs, Const: *], isjoin=False, FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
+    'Query: [LiftProp: [Const: media:news], N2Walk: [Const: refs, VarValue: [Const: bar]], isjoin=False, FiltOper: [Const: -, OrCond: [TagCond: [TagMatch: [Const: foo]], TagCond: [TagMatch: [Const: bar]]]]]',
     'Query: [LiftProp: [Const: media:news], EditEdgeDel: [Const: refs, SubQuery: [Query: [LiftPropBy: [Const: inet:fqdn, Const: =, Const: woot.com]]]]]',
     'Query: [LiftProp: [Const: media:news], EditEdgeAdd: [Const: refs, SubQuery: [Query: [LiftPropBy: [Const: inet:fqdn, Const: =, Const: woot.com]]]]]',
     'Query: [CmdOper: [Const: cron, List: [Const: add, Const: --monthly, Const: -1:12:30, ArgvQuery: [Query: [LiftTag: [TagName: [Const: bar]]]]]]]',
@@ -1237,9 +1247,9 @@ _ParseResults = [
     'Query: [LiftProp: [Const: inet:ipv4], FiltOper: [Const: +, DollarExpr: [ExprAndNode: [Const: 0, Const: and, Const: 1]]]]',
     'Query: [SetVarOper: [Const: x, DollarExpr: [ExprNode: [VarValue: [Const: x], Const: -, Const: 1]]]]',
     'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], FiltOper: [Const: +, DollarExpr: [ExprNode: [ExprNode: [RelPropValue: [Const: asn], Const: +, Const: 20], Const: >=, Const: 42]]]]',
-    'Query: [LiftProp: [Const: inet:ipv4], N1Walk: [Const: seen, Const: foo:bar:baz]]',
-    'Query: [LiftProp: [Const: inet:ipv4], N1Walk: [Const: seen, List: [Const: foo:bar:baz, Const: hehe:haha:hoho], Const: ^=, Const: lol]]',
-    "Query: [LiftProp: [Const: inet:ipv4], N1Walk: [VarList: ['foo', 'bar'], List: [VarValue: [Const: baz], VarValue: [Const: faz]], Const: =, Const: lol]]",
+    'Query: [LiftProp: [Const: inet:ipv4], N1Walk: [Const: seen, Const: foo:bar:baz], isjoin=False]',
+    'Query: [LiftProp: [Const: inet:ipv4], N1Walk: [Const: seen, List: [Const: foo:bar:baz, Const: hehe:haha:hoho], Const: ^=, Const: lol], isjoin=False]',
+    "Query: [LiftProp: [Const: inet:ipv4], N1Walk: [VarList: ['foo', 'bar'], List: [VarValue: [Const: baz], VarValue: [Const: faz]], Const: =, Const: lol], isjoin=False]",
     'Query: [SetVarOper: [Const: x, DollarExpr: [ExprList: [Const: foo, Const: bar]]]]',
     'Query: [SetVarOper: [Const: x, DollarExpr: [ExprList: [Const: foo, Const: bar]]]]',
     'Query: [SetVarOper: [Const: x, DollarExpr: [ExprDict: [Const: foo, Const: bar, Const: baz, Const: 10]]]]',
@@ -1274,6 +1284,16 @@ _ParseResults = [
     'Query: [LiftProp: [Const: inet:ipv4]]',
     'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4]]',
     'Query: [LiftPropBy: [VarValue: [Const: form], Const: =, VarValue: [Const: valu]]]',
+    'Query: [LiftProp: [Const: inet:ipv4], N1WalkNPivo: [], isjoin=True]',
+    'Query: [LiftProp: [Const: file:bytes], N2WalkNPivo: [], isjoin=True]',
+    'Query: [LiftProp: [Const: inet:asn], N2Walk: [Const: edge, Const: *], isjoin=True]',
+    'Query: [LiftProp: [Const: inet:asn], N1Walk: [Const: edge, Const: *], isjoin=True]',
+    "Query: [LiftProp: [Const: file:bytes], N1Walk: [VarList: ['foobar', 'bizbaz'], List: [VarValue: [Const: biz], VarValue: [Const: boz]], Const: =, Const: lol], isjoin=True]",
+    'Query: [LiftProp: [Const: media:news], N2Walk: [List: [Const: neato, Const: burrito], Const: inet:fqdn], isjoin=True]',
+    'Query: [LiftProp: [Const: inet:ipv4], N2Walk: [Const: *, Const: media:news], isjoin=True]',
+    'Query: [LiftProp: [Const: media:news], N1Walk: [Const: *, Const: inet:fqdn], isjoin=True]',
+    'Query: [LiftProp: [Const: inet:ipv4], N2Walk: [Const: *, Const: *], isjoin=True]',
+    'Query: [LiftProp: [Const: media:news], N1Walk: [Const: *, Const: *], isjoin=True]',
 ]
 
 class GrammarTest(s_t_utils.SynTest):

synapse/tests/test_lib_httpapi.py

@@ -407,6 +407,36 @@ class HttpApiTest(s_tests.SynTest):
                         self.eq('AuthDeny', item.get('code'))
                         self.true(await stream.wait(timeout=6))
 
+            async with self.getHttpSess() as sess:
+                info = {'user': 'visi', 'passwd': 'secret'}
+                async with sess.post(f'https://localhost:{port}/api/v1/login', json=info) as resp:
+                    item = await resp.json()
+                    self.eq('ok', item.get('status'))
+
+                # make sure session works
+                async with sess.get(f'https://localhost:{port}/api/v1/auth/users') as resp:
+                    item = await resp.json()
+                    self.eq('ok', item.get('status'))
+
+                # log out of said session
+                async with sess.get(f'https://localhost:{port}/api/v1/logout') as resp:
+                    item = await resp.json()
+                    self.eq('ok', item.get('status'))
+                    newcookie = resp.headers.get('Set-Cookie')
+                    self.isin('sess=""', newcookie)
+
+                # session no longer works
+                data = {'query': '[ inet:ipv4=1.2.3.4 ]'}
+                async with sess.get(f'https://localhost:{port}/api/v1/storm/nodes', json=data) as resp:
+                    item = await resp.json()
+                    self.eq('err', item.get('status'))
+                    self.eq('NotAuthenticated', item.get('code'))
+
+                async with sess.get(f'https://localhost:{port}/api/v1/auth/users') as resp:
+                    item = await resp.json()
+                    self.eq('err', item.get('status'))
+                    self.eq('NotAuthenticated', item.get('code'))
+
             async with self.getHttpSess() as sess:
 
                 async with sess.post(f'https://localhost:{port}/api/v1/auth/adduser', json=info) as resp:
@@ -425,21 +455,21 @@ class HttpApiTest(s_tests.SynTest):
                     async with sess.get(f'https://localhost:{port}/api/v1/auth/users', auth=heheauth) as resp:
                         item = await resp.json()
                         self.eq('NotAuthenticated', item.get('code'))
-                        self.true(stream.wait(timeout=12))
+                        self.true(await stream.wait(timeout=12))
 
                 await core.setUserLocked(visiiden, True)
                 with self.getAsyncLoggerStream('synapse.lib.httpapi', 'User is locked.') as stream:
                     async with sess.get(f'https://localhost:{port}/api/v1/auth/users', auth=visiauth) as resp:
                         item = await resp.json()
                         self.eq('NotAuthenticated', item.get('code'))
-                        self.true(stream.wait(timeout=12))
+                        self.true(await stream.wait(timeout=12))
                 await core.setUserLocked(visiiden, False)
 
                 with self.getAsyncLoggerStream('synapse.lib.httpapi', 'Incorrect password.') as stream:
                     async with sess.get(f'https://localhost:{port}/api/v1/auth/users', auth=newpauth) as resp:
                         item = await resp.json()
                         self.eq('NotAuthenticated', item.get('code'))
-                        self.true(stream.wait(timeout=12))
+                        self.true(await stream.wait(timeout=12))
 
                 headers = {'Authorization': 'yermom'}
                 async with sess.get(f'https://localhost:{port}/api/v1/auth/users', headers=headers) as resp:
@@ -767,52 +797,6 @@ class HttpApiTest(s_tests.SynTest):
                     retn = await resp.json()
                     self.eq('err', retn.get('status'))
 
-    async def test_http_watch(self):
-
-        async with self.getTestCore() as core:
-
-            visi = await core.auth.addUser('visi')
-
-            await visi.setPasswd('secret')
-
-            host, port = await core.addHttpsPort(0, host='127.0.0.1')
-
-            # with no session user...
-            async with self.getHttpSess() as sess:
-
-                async with sess.ws_connect(f'wss://localhost:{port}/api/v1/watch') as sock:
-                    await sock.send_json({'tags': ['test.visi']})
-                    mesg = await sock.receive_json()
-                    self.eq('errx', mesg['type'])
-                    self.eq('AuthDeny', mesg['data']['code'])
-
-                async with sess.post(f'https://localhost:{port}/api/v1/login', json={'user': 'visi', 'passwd': 'secret'}) as resp:
-                    retn = await resp.json()
-                    self.eq('ok', retn.get('status'))
-                    self.eq('visi', retn['result']['name'])
-
-                async with sess.ws_connect(f'wss://localhost:{port}/api/v1/watch') as sock:
-                    await sock.send_json({'tags': ['test.visi']})
-                    mesg = await sock.receive_json()
-                    self.eq('errx', mesg['type'])
-                    self.eq('AuthDeny', mesg['data']['code'])
-
-                await visi.addRule((True, ('watch',)))
-
-                async with sess.ws_connect(f'wss://localhost:{port}/api/v1/watch') as sock:
-
-                    await sock.send_json({'tags': ['test.visi']})
-                    mesg = await sock.receive_json()
-
-                    self.eq('init', mesg['type'])
-
-                    await core.nodes('[ test:str=woot +#test.visi ]')
-
-                    mesg = await sock.receive_json()
-
-                    self.eq('tag:add', mesg['type'])
-                    self.eq('test.visi', mesg['data']['tag'])
-
     async def test_http_beholder(self):
         self.skipIfNexusReplay()
         async with self.getTestCore() as core:

synapse/tests/test_lib_layer.py

@@ -456,16 +456,15 @@ class LayerTest(s_t_utils.SynTest):
 
                     self.len(1, await core01.nodes('inet:ipv4=5.6.7.8'))
 
-                    # make sure time and user are set on the downstream splices
+                    # make sure time and user are set on the downstream changes
                     root = await core01.auth.getUserByName('root')
 
-                    splices = await alist(layr.splicesBack(size=1))
-                    self.len(1, splices)
-
-                    splice = splices[0][1][1]
-                    self.nn(splice.get('time'))
-                    self.eq(splice.get('user'), root.iden)
-                    self.none(splice.get('prov'))
+                    nedits = await alist(layr.syncNodeEdits2(0, wait=False))
+                    last_edit = nedits[-1]
+                    offs, edit, meta = last_edit
+                    self.gt(meta.get('time'), 0)
+                    self.eq(meta.get('user'), root.iden)
+                    self.notin('prov', meta)
 
     async def test_layer_upstream_with_mirror(self):
 
@@ -626,223 +625,6 @@ class LayerTest(s_t_utils.SynTest):
 
                         self.len(1, await core02.nodes('inet:ipv4=8.7.6.5'))
 
-    async def test_layer_splices(self):
-
-        self.skip('fragile order and deprecated')
-        async with self.getTestCore() as core:
-
-            layr = core.view.layers[0]
-            root = await core.auth.getUserByName('root')
-
-            splices = await alist(layr.splices(None, 10))
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            await core.addTagProp('risk', ('int', {'min': 0, 'max': 100}), {'doc': 'risk score'})
-
-            # Convert a node:add splice
-            await core.nodes('[ test:str=foo ]')
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'node:add')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a prop:set splice with no oldv
-            await core.nodes("test:str=foo [ :tick=2000 ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'prop:set')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['prop'], 'tick')
-            self.eq(splice[1]['valu'], 946684800000)
-            self.eq(splice[1]['oldv'], None)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a prop:set splice with an oldv
-            await core.nodes("test:str=foo [ :tick=2001 ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'prop:set')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['prop'], 'tick')
-            self.eq(splice[1]['valu'], 978307200000)
-            self.eq(splice[1]['oldv'], 946684800000)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a prop:del splice
-            await core.nodes("test:str=foo [ -:tick ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'prop:del')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['prop'], 'tick')
-            self.eq(splice[1]['valu'], 978307200000)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a tag:add splice with no oldv
-            await core.nodes("test:str=foo [ +#haha=2000 ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[4][1]
-            self.eq(splice[0], 'tag:add')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['tag'], 'haha')
-            self.eq(splice[1]['valu'], (946684800000, 946684800001))
-            self.eq(splice[1]['oldv'], None)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a tag:add splice with an oldv
-            await core.nodes("test:str=foo [ +#haha=2001 ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'tag:add')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['tag'], 'haha')
-            self.eq(splice[1]['valu'], (946684800000, 978307200001))
-            self.eq(splice[1]['oldv'], (946684800000, 946684800001))
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a tag:del splice
-            await core.nodes("test:str=foo [ -#haha ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'tag:del')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['tag'], 'haha')
-            self.eq(splice[1]['valu'], (946684800000, 978307200001))
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a tag:prop:add splice with no oldv
-            await core.nodes("test:str=foo [ +#rep:risk=50 ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[5][1]
-            self.eq(splice[0], 'tag:prop:set')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['tag'], 'rep')
-            self.eq(splice[1]['prop'], 'risk')
-            self.eq(splice[1]['valu'], 50)
-            self.eq(splice[1]['oldv'], None)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a tag:prop:add splice with an oldv
-            await core.nodes("test:str=foo [ +#rep:risk=0 ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'tag:prop:set')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['tag'], 'rep')
-            self.eq(splice[1]['prop'], 'risk')
-            self.eq(splice[1]['valu'], 0)
-            self.eq(splice[1]['oldv'], 50)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Convert a tag:prop:del splice
-            await core.nodes("test:str=foo [ -#rep:risk ]")
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[0][1]
-            self.eq(splice[0], 'tag:prop:del')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['tag'], 'rep')
-            self.eq(splice[1]['prop'], 'risk')
-            self.eq(splice[1]['valu'], 0)
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            spliceoffs = (splices[-1][0][0] + 1, 0, 0)
-
-            # Nodedata edits don't make splices
-            nodes = await core.nodes('test:str=foo')
-            await nodes[0].setData('baz', 'nodedataiscool')
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-            self.len(0, splices)
-
-            # Make sure nodedata edits have oldv set
-            nedit = await layr.iterNodeEditLog(spliceoffs[0]).__anext__()
-            self.eq(nedit[1][0][2][0][1], ('baz', 'nodedataiscool', None))
-
-            spliceoffs = (spliceoffs[0] + 1, 0, 0)
-
-            await nodes[0].setData('baz', 'stillcool')
-            nedit = await layr.iterNodeEditLog(spliceoffs[0]).__anext__()
-            self.eq(nedit[1][0][2][0][1], ('baz', 'stillcool', 'nodedataiscool'))
-
-            # Convert a node:del splice
-            await core.nodes('test:str=foo | delnode')
-
-            splices = await alist(layr.splices(spliceoffs, 10))
-
-            splice = splices[2][1]
-            self.eq(splice[0], 'node:del')
-            self.eq(splice[1]['ndef'], ('test:str', 'foo'))
-            self.eq(splice[1]['user'], root.iden)
-            self.nn(splice[1].get('time'))
-
-            # Get all the splices
-            splices = [x async for x in layr.splices()]
-            self.len(26, splices)
-
-            # Get all but the first splice
-            await self.agenlen(25, layr.splices(splices[1][0]))
-
-            await self.agenlen(4, layr.splicesBack(splices[3][0]))
-
-            # Make sure we still get two splices when
-            # offset is not at the beginning of a nodeedit
-            await self.agenlen(2, layr.splices((1, 0, 200), 2))
-            await self.agenlen(2, layr.splicesBack((3, 0, -1), 2))
-
-            # Use the layer api to get the splices
-            url = core.getLocalUrl('*/layer')
-            async with await s_telepath.openurl(url) as layrprox:
-                await self.agenlen(26, layrprox.splices())
-
     async def test_layer_stortype_hier(self):
         stor = s_layer.StorTypeHier(None, None)
 
@@ -1256,11 +1038,15 @@ class LayerTest(s_t_utils.SynTest):
                     nodelist1 = [node.pack() for node in nodelist1]
                     self.eq(nodelist0, nodelist1)
 
-                layr = core1.view.layers[0]
+                layr = core1.view.layers[0]  # type: s_layer.Layer
 
-                # Empty the layer to try again
+                ############################################################################
+                # TEST ONLY - Force the layer nexus handler to consume a truncate event.
+                # This is for backwards compatibility for a mirror that consumes a truncate
+                # event.
+                # This can be removed in 3.0.0.
 
-                await layr.truncate()
+                await layr._push('layer:truncate')
 
                 async with await s_telepath.openurl(url) as layrprox:
 
@@ -1278,7 +1064,7 @@ class LayerTest(s_t_utils.SynTest):
                             'time': 0,
                             }
 
-                    await layr.truncate()
+                    await layr._push('layer:truncate')
 
                     for nodeedits in editlist:
                         self.none(await layrprox.storNodeEditsNoLift(nodeedits, meta=meta))
@@ -1300,6 +1086,8 @@ class LayerTest(s_t_utils.SynTest):
                     core1.schedCoro(doEdit())
                     await asyncio.wait_for(waitForEdit(), timeout=6)
 
+                ############################################################################
+
     async def test_layer_stornodeedits_nonexus(self):
         # test for migration methods that store nodeedits bypassing nexus
 
@@ -1494,9 +1282,9 @@ class LayerTest(s_t_utils.SynTest):
             '''
             await core.nodes('[test:str=foo .seen=(2015, 2016)]')
             layr = core.getLayer(None)
-            lbefore = len(await alist(layr.splices()))
+            lbefore = len(await alist(layr.syncNodeEdits2(0, wait=False)))
             await core.nodes('[test:str=foo .seen=(2015, 2016)]')
-            lafter = len(await alist(layr.splices()))
+            lafter = len(await alist(layr.syncNodeEdits2(0, wait=False)))
             self.eq(lbefore, lafter)
 
     async def test_layer_del_then_lift(self):
@@ -1561,9 +1349,6 @@ class LayerTest(s_t_utils.SynTest):
             readlayr = core.getLayer(readlayrinfo.get('iden'))
             self.true(readlayr.readonly)
 
-            with self.raises(s_exc.IsReadOnly):
-                await readlayr.truncate()
-
     async def test_layer_ro(self):
         with self.getTestDir() as dirn:
             async with self.getTestCore(dirn=dirn) as core:

synapse/tests/test_lib_lmdbslab.py

@@ -1430,6 +1430,28 @@ class LmdbSlabTest(s_t_utils.SynTest):
                 self.len(6, items)
                 self.eq(items, ['bot', 'timewarp', 'foo', 'bar', 'baz', 'eot'])
 
+    async def test_lmdbslab_count(self):
+
+        with self.getTestDir() as dirn:
+
+            path = os.path.join(dirn, 'test.lmdb')
+            async with await s_lmdbslab.Slab.anit(path) as slab:
+
+                testdb = slab.initdb('test')
+                dupsdb = slab.initdb('dups', dupsort=True)
+
+                self.eq(0, slab.count(b'newp', db=testdb))
+                self.eq(0, slab.count(b'newp', db=dupsdb))
+
+                slab.put(b'foo', b'bar', db=testdb)
+
+                self.eq(1, slab.count(b'foo', db=testdb))
+
+                slab.put(b'foo', b'bar', db=dupsdb)
+                slab.put(b'foo', b'baz', db=dupsdb)
+                slab.put(b'foo', b'faz', db=dupsdb)
+
+                self.eq(3, slab.count(b'foo', db=dupsdb))
 
 class LmdbSlabMemLockTest(s_t_utils.SynTest):
 

synapse/tests/test_lib_snap.py

@@ -625,3 +625,12 @@ class SnapTest(s_t_utils.SynTest):
             self.len(1, await core.nodes('test:ro=foo [ :readable = haha ]'))
             with self.raises(s_exc.ReadOnlyProp):
                 await core.nodes('test:ro=foo [ :readable=newp ]')
+
+    async def test_snap_subs_depth(self):
+
+        async with self.getTestCore() as core:
+            fqdn = '.'.join(['x' for x in range(300)]) + '.foo.com'
+            q = f'[ inet:fqdn="{fqdn}"]'
+            nodes = await core.nodes(q)
+            self.len(1, nodes)
+            self.eq(nodes[0].get('zone'), 'foo.com')

synapse/tests/test_lib_spooled.py

@@ -84,6 +84,10 @@ class SpooledTest(s_test.SynTest):
             self.eq(list(x.keys()), (10, 20, 30))
             self.true(x.has(20))
             self.false(x.has(99))
+            self.eq('haha', x.pop(20))
+            self.len(2, x)
+            self.eq(None, x.pop(20))
+            self.len(2, x)
 
         async with await s_spooled.Dict.anit(size=2) as sd0:
             await runtest(sd0)