synapse 2.161.0__py311-none-any.whl → 2.162.0__py311-none-any.whl

synapse/tests/test_lib_storm.py

@@ -735,9 +735,9 @@ class StormTest(s_t_utils.SynTest):
             # check that the feed API uses toprim
             email = await core.callStorm('''
                 $iden = $lib.guid()
-                $props = $lib.dict(email=visi@vertex.link)
+                $props = ({"email": "visi@vertex.link"})
                 $lib.feed.ingest(syn.nodes, (
-                    ( (ps:contact, $iden), $lib.dict(props=$props)),
+                    ( (ps:contact, $iden), ({"props": $props})),
                 ))
                 ps:contact=$iden
                 return(:email)
@@ -746,9 +746,9 @@ class StormTest(s_t_utils.SynTest):
 
             email = await core.callStorm('''
                 $iden = $lib.guid()
-                $props = $lib.dict(email=visi@vertex.link)
+                $props = ({"email": "visi@vertex.link"})
                 yield $lib.feed.genr(syn.nodes, (
-                    ( (ps:contact, $iden), $lib.dict(props=$props)),
+                    ( (ps:contact, $iden), ({"props": $props})),
                 ))
                 return(:email)
             ''')
@@ -777,7 +777,7 @@ class StormTest(s_t_utils.SynTest):
             # and again to test *not* creating it...
             self.eq(0, await core.callStorm('return($lib.queue.gen(woot).size())'))
 
-            self.eq({'foo': 'bar'}, await core.callStorm('return($lib.dict(    foo    =    bar   ))'))
+            self.eq({'foo': 'bar'}, await core.callStorm('return(({    "foo"    :    "bar"   }))'))
 
             ddef0 = await core.callStorm('return($lib.dmon.add(${ $lib.queue.gen(hehedmon).put(lolz) $lib.time.sleep(10) }, name=hehedmon))')
             ddef1 = await core.callStorm('return($lib.dmon.get($iden))', opts={'vars': {'iden': ddef0.get('iden')}})
@@ -1226,12 +1226,12 @@ class StormTest(s_t_utils.SynTest):
             await core.nodes('cron.list')
 
             self.eq({'foo': 'bar', 'baz': 'faz'}, await core.callStorm('''
-                return($lib.dict( // do foo thing
-                    foo /* hehe */ = /* haha */ bar, //lol
-                    baz // hehe
-                    = // haha
-                    faz // hehe
-                ))
+                return(({ // do foo thing
+                    "foo" /* hehe */ : /* haha */ "bar", //lol
+                    "baz" // hehe
+                    : // haha
+                    "faz" // hehe
+                }))
             '''))
 
             self.eq(('foo', 'bar', 'baz'), await core.callStorm('''
@@ -1805,7 +1805,7 @@ class StormTest(s_t_utils.SynTest):
 
             # Headers as list of tuples, params as dict
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $hdr = (
                     ("User-Agent", "my fav ua"),
             )|
@@ -2045,7 +2045,7 @@ class StormTest(s_t_utils.SynTest):
             self.none(await core.callStorm('''
                 [ ps:contact = * ]
                 if $node {
-                    $foo = $lib.dict()
+                    $foo = ({})
                     $foo.bar = $lib.undef
                     return($foo.bar)
                 }
@@ -2064,7 +2064,7 @@ class StormTest(s_t_utils.SynTest):
             # runtsafe variants
             self.eq(('foo', 'baz'), await core.callStorm('$foo = (foo, bar, baz) $foo.1 = $lib.undef return($foo)'))
             self.eq(('foo', 'bar'), await core.callStorm('$foo = (foo, bar, baz) $foo."-1" = $lib.undef return($foo)'))
-            self.none(await core.callStorm('$foo = $lib.dict() $foo.bar = 10 $foo.bar = $lib.undef return($foo.bar)'))
+            self.none(await core.callStorm('$foo = ({}) $foo.bar = 10 $foo.bar = $lib.undef return($foo.bar)'))
             self.eq(('woot',), await core.callStorm('''
                 $foo = (foo, bar, baz)
                 $foo.0 = $lib.undef

synapse/tests/test_lib_stormhttp.py

@@ -64,8 +64,8 @@ class StormHttpTest(s_test.SynTest):
 
             # Header and params as dict
             q = '''
-            $params=$lib.dict(key=valu, foo=bar, baz=$lib.false)
-            $hdr = $lib.dict(true=$lib.true)
+            $params=({"key": "valu", "foo": "bar", "baz": $lib.false})
+            $hdr = ({"true": $lib.true})
             $hdr."User-Agent"="Storm HTTP Stuff"
             $k = (0)
             $hdr.$k="Why"
@@ -240,7 +240,7 @@ class StormHttpTest(s_test.SynTest):
             opts = {'vars': {'url': url, 'noauth_url': noauth_url, 'newp_url': newp_url}}
 
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -256,7 +256,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq('1', headers.get('Head'))
 
             q = '''
-            $params=$lib.dict(key=valu, redirect='http://test.newp/')
+            $params=({"key": "valu", "redirect": 'http://test.newp/'})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -273,7 +273,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq('http://test.newp/', headers.get('Location'))
 
             q = '''
-            $params=$lib.dict(key=valu, redirect=$noauth_url)
+            $params=({"key": "valu", "redirect": $noauth_url})
             $hdr = (
                 ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -286,7 +286,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq(b'', body)
 
             q = '''
-            $params=$lib.dict(key=valu, redirect=$newp_url)
+            $params=({"key": "valu", "redirect": $newp_url})
             $hdr = (
                 ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -299,7 +299,7 @@ class StormHttpTest(s_test.SynTest):
             self.eq(b'', body)
 
             q = '''
-            $params=$lib.dict(key=valu, redirect="http://127.0.0.1/newp")
+            $params=({"key": "valu", "redirect": "http://127.0.0.1/newp"})
             $hdr = (
                 ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -321,7 +321,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -337,7 +337,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url, 'sleep': 1, 'timeout': 2}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar, sleep=$sleep)
+            $params=({"key": "valu", "foo": "bar", "sleep": $sleep})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -351,7 +351,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url, 'sleep': 10, 'timeout': 1}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar, sleep=$sleep)
+            $params=({"key": "valu", "foo": "bar", "sleep": $sleep})
             $hdr = (
                     ("User-Agent", "Storm HTTP Stuff"),
             )
@@ -374,7 +374,7 @@ class StormHttpTest(s_test.SynTest):
 
             adduser = '''
                 $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/auth/adduser", port=$port)
-                $user = $lib.dict(name=$name, passwd=$passwd)
+                $user = ({"name": $name, "passwd": $passwd})
                 $post = $lib.inet.http.post($url, json=$user, ssl_verify=$(0)).json().result.name
                 $lib.print($post)
                 [ test:str=$post ]
@@ -387,7 +387,7 @@ class StormHttpTest(s_test.SynTest):
             adduser = '''
                 $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/auth/adduser", port=$port)
                 $user = $lib.str.format('{"name": "{name}", "passwd": "{passwd}"}', name=$name, passwd=$passwd)
-                $header = $lib.dict("Content-Type"="application/json")
+                $header = ({"Content-Type": "application/json"})
                 $post = $lib.inet.http.post($url, headers=$header, body=$user,  ssl_verify=$(0)).json().result.name
                 [ test:str=$post ]
             '''
@@ -400,7 +400,7 @@ class StormHttpTest(s_test.SynTest):
             url = f'https://root:root@127.0.0.1:{port}/api/v0/test'
             opts = {'vars': {'url': url, 'buf': b'1234'}}
             q = '''
-            $params=$lib.dict(key=valu, foo=bar)
+            $params=({"key": "valu", "foo": "bar"})
             $resp = $lib.inet.http.post($url, params=$params, body=$buf, ssl_verify=$lib.false)
             return ( $resp.json() )
             '''
@@ -411,9 +411,9 @@ class StormHttpTest(s_test.SynTest):
 
             q = '''
             $fields=$lib.list(
-                $lib.dict(name=foo, value=bar),
-                $lib.dict(name=foo, value=bar2),
-                $lib.dict(name=baz, value=cool)
+                ({"name": "foo", "value": "bar"}),
+                ({"name": "foo", "value": "bar2"}),
+                ({"name": "baz", "value": "cool"})
             )
             $resp = $lib.inet.http.post($url, fields=$fields, ssl_verify=$lib.false)
             return ( $resp.json() )
@@ -467,7 +467,7 @@ class StormHttpTest(s_test.SynTest):
             text = '''
             $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/storm", port=$port)
             $stormq = "($size, $sha2) = $lib.bytes.put($lib.base64.decode('dmVydGV4')) [ test:str = $sha2 ] [ test:int = $size ]"
-            $json = $lib.dict(query=$stormq)
+            $json = ({"query": $stormq})
             $bytez = $lib.inet.http.post($url, json=$json, ssl_verify=$(0))
             '''
             opts = {'vars': {'port': port}}
@@ -482,7 +482,7 @@ class StormHttpTest(s_test.SynTest):
 
             text = '''
             $url = $lib.str.format("https://root:root@127.0.0.1:{port}/api/v1/storm", port=$port)
-            $json = $lib.dict(query="test:str")
+            $json = ({"query": "test:str"})
             $body = $json
             $resp=$lib.inet.http.post($url, json=$json, body=$body, ssl_verify=$(0))
             return ( ($resp.code, $resp.err) )

synapse/tests/test_lib_stormlib_auth.py

@@ -420,8 +420,8 @@ class StormLibAuthTest(s_test.SynTest):
         async with self.getTestCore() as core:
             self.none(await core.callStorm('return($lib.user.json.get(foo))'))
             self.none(await core.callStorm('return($lib.user.json.get(foo, prop=bar))'))
-            self.true(await core.callStorm('return($lib.user.json.set(hi, $lib.dict(foo=bar, baz=faz)))'))
-            self.true(await core.callStorm('return($lib.user.json.set(bye/bye, $lib.dict(zip=zop, bip=bop)))'))
+            self.true(await core.callStorm('return($lib.user.json.set(hi, ({"foo": "bar", "baz": "faz"})))'))
+            self.true(await core.callStorm('return($lib.user.json.set(bye/bye, ({"zip": "zop", "bip": "bop"})))'))
             self.eq('bar', await core.callStorm('return($lib.user.json.get(hi, prop=foo))'))
             self.eq({'foo': 'bar', 'baz': 'faz'}, await core.callStorm('return($lib.user.json.get(hi))'))
 
@@ -454,7 +454,7 @@ class StormLibAuthTest(s_test.SynTest):
                 await core.callStorm('return($lib.auth.users.byname(root).json.get(bye/bye, prop=zip))', opts=asvisi)
 
             self.none(await core.callStorm('return($lib.user.json.get(hi))', opts=asvisi))
-            await core.callStorm('if (not $lib.user.json.has(hehe)) { $lib.user.json.set(hehe, $lib.dict()) }', opts=asvisi)
+            await core.callStorm('if (not $lib.user.json.has(hehe)) { $lib.user.json.set(hehe, ({})) }', opts=asvisi)
 
             self.true(await core.callStorm('return($lib.user.json.set(hehe, haha, prop=foo))', opts=asvisi))
             self.true(await core.callStorm('return($lib.user.json.set(hehe, haha, prop=foo))', opts=asvisi))

synapse/tests/test_lib_stormlib_cell.py

@@ -187,7 +187,7 @@ class StormCellTest(s_test.SynTest):
                         }
                         $lib.exit('No view found for name={name}', name=$name)
                     }
-                    $ret = $lib.dict()
+                    $ret = ({})
                     $ret.baseview=$get_view(default)
                     $ret.fork1a=$get_view(base1a)
                     $ret.fork2a=$get_view(base2a)

synapse/tests/test_lib_stormlib_cortex.py

@@ -429,6 +429,44 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
             '''
             iden3 = await core.callStorm(q)
 
+            # $lib.dict accessor methods
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.keys($api.vars))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, ('hehe', 'items'))
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.values($api.vars))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, ('wow', ('1', '2', 3)))
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.has($api.vars, anotherKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.false(valu)
+
+            q = '''$api=$lib.cortex.httpapi.get($iden)
+            return ($lib.dict.update($api.vars, ({"hehe": "haha", "anotherKey": "anotherValu"}) ))'''
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.none(valu)
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.has($api.vars, anotherKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.true(valu)
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.values($api.vars))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, ('haha', ('1', '2', 3), 'anotherValu'))
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.pop($api.vars, anotherKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, 'anotherValu')
+
+            q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.pop($api.vars, anotherKey, missingKey))'
+            valu = await core.callStorm(q, opts={'vars': {'iden': iden3}})
+            self.eq(valu, 'missingKey')
+
+            with self.raises(s_exc.BadArg):
+                q = '$api=$lib.cortex.httpapi.get($iden) return ($lib.dict.pop($api.vars, anotherKey))'
+                await core.callStorm(q, opts={'vars': {'iden': iden3}})
+
             msgs = await core.stormlist('cortex.httpapi.list')
             self.stormIsInPrint(f'0     {iden0}', msgs)
             self.stormIsInPrint(f'1     {iden1}', msgs)
@@ -569,7 +607,7 @@ $request.reply(206, headers=$headers, body=({"no":"body"}))
             msgs = await core.stormlist('cortex.httpapi.stat $iden', opts={'vars': {'iden': iden3}})
             self.stormIsInPrint(f'Iden: {iden3}', msgs)
             self.stormIsInPrint('The handler has the following runtime variables set:', msgs)
-            self.stormIsInPrint('hehe             => wow', msgs)
+            self.stormIsInPrint('hehe             => haha', msgs)
             self.stormIsInPrint("items            => ('1', '2', 3)", msgs)
 
             # Remove a user + view and stat the handler
@@ -999,7 +1037,11 @@ for $i in $values {
             }
             // Cannot modify request headers
             $api.methods.post = ${
-                $request.headers.newp = haha
+                if $request.headers.dictmethod {
+                    $lib.dict.update($request.headers, ({"newp": "haha"}))
+                } else {
+                    $request.headers.newp = haha
+                }
             }
             return ( ($api.iden, $api.owner.name) )
             '''
@@ -1029,6 +1071,12 @@ for $i in $values {
                 self.eq(data.get('code'), 'StormRuntimeError')
                 self.eq(data.get('mesg'), 'http:api:request:headers may not be modified by the runtime.')
 
+                resp = await sess.post(f'https://localhost:{hport}/api/ext/testpath', headers={'dictmethod': '1'})
+                self.eq(resp.status, 500)
+                data = await resp.json()
+                self.eq(data.get('code'), 'StormRuntimeError')
+                self.eq(data.get('mesg'), 'http:api:request:headers may not be modified by the runtime.')
+
     async def test_libcortex_httpapi_vars(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_lib_stormlib_json.py

@@ -27,7 +27,7 @@ class JsonTest(s_test.SynTest):
 
             opts = {'vars': {'schema': s_test.test_schema}}
             q = '''$schemaObj = $lib.json.schema($schema)
-            $item=$lib.dict()
+            $item=({})
             $item."key:integer"=(4)
             return ( $schemaObj.validate($item) )
             '''
@@ -37,7 +37,7 @@ class JsonTest(s_test.SynTest):
             self.eq('Default string!', valu.get('key:string'))
 
             q = '''$schemaObj = $lib.json.schema($schema)
-            $item=$lib.dict()
+            $item=({})
             $item."key:integer"=4
             return ( $schemaObj.validate($item) )
             '''

synapse/tests/test_lib_stormlib_macro.py

@@ -152,7 +152,7 @@ class MacroTest(s_test.SynTest):
             self.eq([('test:str', 'cooler')], [n.ndef for n in nodes])
 
             # Inner vars win on conflict
-            q = 'macro.set data2 ${ $data=$lib.dict(value=beef) [test:str=$data.value +#cool.story] }'
+            q = 'macro.set data2 ${ $data=({"value": "beef"}) [test:str=$data.value +#cool.story] }'
             msgs = await core.stormlist(q)
             self.stormIsInPrint('Set macro: data2', msgs)
 

synapse/tests/test_lib_stormlib_modelext.py

@@ -12,16 +12,16 @@ class StormtypesModelextTest(s_test.SynTest):
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
 
                 $propinfo = ({"doc": "A test prop doc."})
-                $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
 
                 $univinfo = ({"doc": "A test univ doc."})
-                $lib.model.ext.addUnivProp(_woot, (int, $lib.dict()), $univinfo)
+                $lib.model.ext.addUnivProp(_woot, (int, ({})), $univinfo)
 
                 $tagpropinfo = ({"doc": "A test tagprop doc."})
-                $lib.model.ext.addTagProp(score, (int, $lib.dict()), $tagpropinfo)
+                $lib.model.ext.addTagProp(score, (int, ({})), $tagpropinfo)
 
                 $pinfo = ({"doc": "Extended a core model."})
-                $lib.model.ext.addFormProp(test:int, _tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(test:int, _tick, (time, ({})), $propinfo)
             ''')
 
             nodes = await core.nodes('[ _visi:int=10 :tick=20210101 ._woot=30 +#lol:score=99 ]')
@@ -37,11 +37,11 @@ class StormtypesModelextTest(s_test.SynTest):
             self.eq(nodes[0].get('_tick'), 1609459200000)
 
             with self.raises(s_exc.DupPropName):
-                q = '''$lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.DupPropName):
-                q = '''$lib.model.ext.addUnivProp(_woot, (time, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addUnivProp(_woot, (time, ({})), ({}))'''
                 await core.callStorm(q)
 
             # Grab the extended model definitions
@@ -64,45 +64,45 @@ class StormtypesModelextTest(s_test.SynTest):
             self.none(core.model.tagprop('score'))
 
             # Underscores can exist in extended names but only at specific locations
-            q = '''$l =$lib.list('str', $lib.dict()) $d=$lib.dict(doc="Foo")
+            q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
             $lib.model.ext.addFormProp('test:str', '_test:_myprop', $l, $d)
             '''
             self.none(await core.callStorm(q))
-            q = '$lib.model.ext.addUnivProp(_woot:_stuff, (int, $lib.dict()), $lib.dict())'
+            q = '$lib.model.ext.addUnivProp(_woot:_stuff, (int, ({})), ({}))'
             self.none(await core.callStorm(q))
 
-            q = '''$lib.model.ext.addTagProp(_score, (int, $lib.dict()), $lib.dict())'''
+            q = '''$lib.model.ext.addTagProp(_score, (int, ({})), ({}))'''
             self.none(await core.callStorm(q))
 
-            q = '''$lib.model.ext.addTagProp(some:_score, (int, $lib.dict()), $lib.dict())'''
+            q = '''$lib.model.ext.addTagProp(some:_score, (int, ({})), ({}))'''
             self.none(await core.callStorm(q))
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$l =$lib.list('str', $lib.dict()) $d=$lib.dict(doc="Foo")
+                q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
                 $lib.model.ext.addFormProp('test:str', '_test:_my^prop', $l, $d)
                 '''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$l =$lib.list('str', $lib.dict()) $d=$lib.dict(doc="Foo")
+                q = '''$l =$lib.list('str', ({})) $d=({"doc": "Foo"})
                 $lib.model.ext.addFormProp('test:str', '_test::_myprop', $l, $d)
                 '''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addUnivProp(_woot^stuff, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addUnivProp(_woot^stuff, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addUnivProp(_woot:_stuff^2, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addUnivProp(_woot:_stuff^2, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addTagProp(some^score, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addTagProp(some^score, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             with self.raises(s_exc.BadPropDef):
-                q = '''$lib.model.ext.addTagProp(_someones:_score^value, (int, $lib.dict()), $lib.dict())'''
+                q = '''$lib.model.ext.addTagProp(_someones:_score^value, (int, ({})), ({}))'''
                 await core.callStorm(q)
 
             # Permission errors
@@ -110,27 +110,27 @@ class StormtypesModelextTest(s_test.SynTest):
             opts = {'user': visi.iden}
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $typeinfo = $lib.dict()
-                    $forminfo = $lib.dict(doc="A test form doc.")
+                    $typeinfo = ({})
+                    $forminfo = ({"doc": "A test form doc."})
                     $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
                 ''', opts=opts)
 
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $propinfo = $lib.dict(doc="A test prop doc.")
-                    $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                    $propinfo = ({"doc": "A test prop doc."})
+                    $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
                 ''', opts=opts)
 
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $univinfo = $lib.dict(doc="A test univ doc.")
-                    $lib.model.ext.addUnivProp(".woot", (int, $lib.dict()), $univinfo)
+                    $univinfo = ({"doc": "A test univ doc."})
+                    $lib.model.ext.addUnivProp(".woot", (int, ({})), $univinfo)
                 ''', opts=opts)
 
             with self.raises(s_exc.AuthDeny):
                 await core.callStorm('''
-                    $tagpropinfo = $lib.dict(doc="A test tagprop doc.")
-                    $lib.model.ext.addTagProp(score, (int, $lib.dict()), $tagpropinfo)
+                    $tagpropinfo = ({"doc": "A test tagprop doc."})
+                    $lib.model.ext.addTagProp(score, (int, ({})), $tagpropinfo)
                 ''', opts=opts)
 
         # Reload the model extensions automatically
@@ -164,16 +164,16 @@ class StormtypesModelextTest(s_test.SynTest):
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
 
                 $propinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
 
                 $univinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addUnivProp(_woot, (int, $lib.dict()), $univinfo)
+                $lib.model.ext.addUnivProp(_woot, (int, ({})), $univinfo)
 
                 $tagpropinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addTagProp(score, (int, $lib.dict()), $tagpropinfo)
+                $lib.model.ext.addTagProp(score, (int, ({})), $tagpropinfo)
 
                 $pinfo = ({"doc": "NEWP"})
-                $lib.model.ext.addFormProp(test:int, _tick, (time, $lib.dict()), $propinfo)
+                $lib.model.ext.addFormProp(test:int, _tick, (time, ({})), $propinfo)
             ''')
 
             q = '''return ($lib.model.ext.addExtModel($model_defs))'''
@@ -248,10 +248,10 @@ class StormtypesModelextTest(s_test.SynTest):
                     self.eq(mesg['type'], 'init')
 
                     await core.callStorm('''
-                        $lib.model.ext.addForm(_behold:score, int, $lib.dict(), $lib.dict(doc="first string"))
-                        $lib.model.ext.addFormProp(_behold:score, rank, (int, $lib.dict()), $lib.dict(doc="second string"))
-                        $lib.model.ext.addUnivProp(_beep, (int, $lib.dict()), $lib.dict(doc="third string"))
-                        $lib.model.ext.addTagProp(thingy, (int, $lib.dict()), $lib.dict(doc="fourth string"))
+                        $lib.model.ext.addForm(_behold:score, int, ({}), ({"doc": "first string"}))
+                        $lib.model.ext.addFormProp(_behold:score, rank, (int, ({})), ({"doc": "second string"}))
+                        $lib.model.ext.addUnivProp(_beep, (int, ({})), ({"doc": "third string"}))
+                        $lib.model.ext.addTagProp(thingy, (int, ({})), ({"doc": "fourth string"}))
                     ''')
 
                     formmesg = await sock.receive_json()
@@ -310,12 +310,12 @@ class StormtypesModelextTest(s_test.SynTest):
         async with self.getTestCore() as core:
 
             await core.callStorm('''
-                $typeinfo = $lib.dict()
-                $forminfo = $lib.dict(doc="A test form doc.")
+                $typeinfo = ({})
+                $forminfo = ({"doc": "A test form doc."})
                 $lib.model.ext.addForm(_visi:int, int, $typeinfo, $forminfo)
 
-                $propinfo = $lib.dict(doc="A test prop doc.")
-                $lib.model.ext.addFormProp(_visi:int, tick, (time, $lib.dict()), $propinfo)
+                $propinfo = ({"doc": "A test prop doc."})
+                $lib.model.ext.addFormProp(_visi:int, tick, (time, ({})), $propinfo)
             ''')
 
             self.nn(core.model.form('_visi:int'))
@@ -326,7 +326,7 @@ class StormtypesModelextTest(s_test.SynTest):
                 await core.callStorm(q)
             self.eq('Form has extended properties: tick', exc.exception.get('mesg'))
 
-            await core.callStorm('$lib.model.ext.addFormProp(_visi:int, tock, (time, $lib.dict()), $lib.dict())')
+            await core.callStorm('$lib.model.ext.addFormProp(_visi:int, tock, (time, ({})), ({}))')
 
             self.nn(core.model.form('_visi:int'))
             self.nn(core.model.prop('_visi:int:tick'))

synapse/tests/test_lib_stormlib_oauth.py

@@ -148,9 +148,9 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $headers = $lib.dict(
-                "content-type"="application/json"
-            )
+            $headers = ({
+                "content-type": "application/json"
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_HEADER)
             return($client.sign($url, headers=$headers))
             '''
@@ -182,13 +182,13 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $headers = $lib.dict(
-                "Content-Type"="application/json"
-            )
-            $body = $lib.dict(
-                foo = bar,
-                biz = baz,
-            )
+            $headers = ({
+                "Content-Type": "application/json"
+            })
+            $body = ({
+                'foo': 'bar',
+                'biz': 'baz',
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_BODY)
             return($client.sign($url, method='POST', headers=$headers, body=$body))
             '''
@@ -214,9 +214,9 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $body = $lib.dict(
-                awesome = possum,
-            )
+            $body = ({
+                'awesome': 'possum',
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_BODY)
             return($client.sign($url, method='POST', headers=$lib.null, body=$body))
             '''
@@ -233,13 +233,13 @@ class OAuthTest(s_test.SynTest):
             $csec = boop
             $atkn = neato
             $asec = burrito
-            $headers = $lib.dict(
-                "Content-Type"="application/json"
-            )
-            $body = $lib.dict(
-                foo = bar,
-                biz = baz,
-            )
+            $headers = ({
+                "Content-Type": "application/json"
+            })
+            $body = ({
+                'foo': 'bar',
+                'biz': 'baz',
+            })
             $client = $lib.inet.http.oauth.v1.client($ckey, $csec, $atkn, $asec, $lib.inet.http.oauth.v1.SIG_BODY)
             return($client.sign($url, headers=$headers, body=$body))
             '''

synapse/tests/test_lib_stormlib_stix.py

@@ -428,6 +428,7 @@ class StormLibStixTest(s_test.SynTest):
                         "stix": {
                             "vtx-mitigation": {
                                 "props": {
+                                    "desc": "return($desc)",
                                     "name": "{+:name return(:name)} return($node.repr())",
                                     "created": "return($lib.stix.export.timestamp(.created))",
                                     "modified": "return($lib.stix.export.timestamp(.created))",
@@ -440,13 +441,14 @@ class StormLibStixTest(s_test.SynTest):
                 }
 
                 [ risk:mitigation=c4f6dc09f1e1e6b7e7b05c9ce4186ce8 :name="patch stuff and do things" ]
-
+                $desc = "scopevar"
                 $bundle.add($node)
 
                 fini { return($bundle) }
             ''')
 
             self.eq('vtx-mitigation--2df2a437-e372-468b-b989-d01753603659', bund['objects'][1]['id'])
+            self.eq('scopevar', bund['objects'][1]['desc'])
             self.eq('patch stuff and do things', bund['objects'][1]['name'])
             self.nn(bund['objects'][1]['created'])
             self.nn(bund['objects'][1]['modified'])