value_hash -> zonefile_hash

This commit is contained in:
Jude Nelson
2017-09-27 21:15:30 -04:00
parent 4534ebafc9
commit c85c06452e
16 changed files with 39 additions and 39 deletions

View File

@@ -195,7 +195,7 @@ def scenario( wallets, **kw ):
testlib.next_block(**kw) # 702
resp = testlib.blockstack_name_register("foo.test", wallets[3].privkey, wallets[4].addr, value_hash='33' * 20)
resp = testlib.blockstack_name_register("foo.test", wallets[3].privkey, wallets[4].addr, zonefile_hash='33' * 20)
if 'error' in resp:
print resp
return False

View File

@@ -103,7 +103,7 @@ def scenario( wallets, **kw ):
print whois
return False
resp = testlib.blockstack_name_renew( 'foo.test', wallets[3].privkey, value_hash='22'*20, recipient_addr=wallets[2].addr)
resp = testlib.blockstack_name_renew( 'foo.test', wallets[3].privkey, zonefile_hash='22'*20, recipient_addr=wallets[2].addr)
if 'error' in resp:
print resp
return False

View File

@@ -154,7 +154,7 @@ def scenario( wallets, **kw ):
testlib.next_block( **kw ) # 701
testlib.next_block( **kw ) # 702
resp = testlib.blockstack_name_renew( 'foo.test', wallets[3].privkey, value_hash='22'*20, recipient_addr=wallets[2].addr)
resp = testlib.blockstack_name_renew( 'foo.test', wallets[3].privkey, zonefile_hash='22'*20, recipient_addr=wallets[2].addr)
if 'error' in resp:
print resp
return False

View File

@@ -188,7 +188,7 @@ def scenario( wallets, **kw ):
return False
# renew should work
resp = testlib.blockstack_name_renew( 'foo.test', wallets[3].privkey, value_hash='22'*20, recipient_addr=wallets[2].addr)
resp = testlib.blockstack_name_renew( 'foo.test', wallets[3].privkey, zonefile_hash='22'*20, recipient_addr=wallets[2].addr)
if 'error' in resp:
print resp
return False

View File

@@ -56,13 +56,13 @@ def scenario( wallets, **kw ):
testlib.next_block( **kw ) # 692
# should fail (safety checks stop it)
resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, value_hash='22' * 20)
resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20)
if 'error' not in resp:
print resp
return False
# should succeed in being sent, but will be rejected
resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, value_hash='22' * 20, safety_checks=False, tx_fee=300 * 5)
resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20, safety_checks=False, tx_fee=300 * 5)
if 'error' in resp:
print resp
return False
@@ -78,7 +78,7 @@ def scenario( wallets, **kw ):
# epoch 3 now active.
# try again, and it should succeed
resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, value_hash='22' * 20)
resp = testlib.blockstack_name_register('foo.test', wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20)
if 'error' in resp:
print resp
return False

View File

@@ -64,13 +64,13 @@ def scenario( wallets, **kw ):
return False
# should fail (safety checks stop it)
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, value_hash='22' * 20, recipient_addr=wallets[0].addr )
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr )
if 'error' not in resp:
print resp
return False
# should succeed in being sent
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, value_hash='22' * 20, recipient_addr=wallets[0].addr, safety_checks=False, tx_fee=650 * 5 )
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr, safety_checks=False, tx_fee=650 * 5 )
if 'error' in resp:
print resp
return False
@@ -95,7 +95,7 @@ def scenario( wallets, **kw ):
testlib.next_block( **kw ) # 695
# should succeed
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, value_hash='22' * 20, recipient_addr=wallets[0].addr )
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr )
if 'error' in resp:
print resp
return False

View File

@@ -67,7 +67,7 @@ def scenario( wallets, **kw ):
testlib.next_block( **kw )
# renew/xfer/update
res = testlib.blockstack_name_renew("foo.test", wallets[3].privkey, value_hash="22" * 20, recipient_addr=wallets[4].addr)
res = testlib.blockstack_name_renew("foo.test", wallets[3].privkey, zonefile_hash="22" * 20, recipient_addr=wallets[4].addr)
if 'error' in res:
print res
return False
@@ -75,7 +75,7 @@ def scenario( wallets, **kw ):
testlib.next_block(**kw)
# renew/update
res = testlib.blockstack_name_renew("foo.test", wallets[4].privkey, value_hash="33" * 20)
res = testlib.blockstack_name_renew("foo.test", wallets[4].privkey, zonefile_hash="33" * 20)
if 'error' in res:
print res
return False

View File

@@ -80,7 +80,7 @@ def scenario( wallets, **kw ):
print res
return False
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, value_hash='11' * 20 )
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='11' * 20 )
if 'error' in resp:
print json.dumps( resp, indent=4 )
@@ -102,7 +102,7 @@ def scenario( wallets, **kw ):
# update/transfer
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, value_hash='22' * 20, recipient_addr=wallets[0].addr )
resp = testlib.blockstack_name_renew( "foo.test", wallets[3].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr )
if 'error' in resp:
print json.dumps( resp, indent=4 )

View File

@@ -123,7 +123,7 @@ def scenario( wallets, **kw ):
if dest_hostport is None:
return 0.0
host, port = blockstack_client.config.url_to_host_port( dest_hostport )
host, port = blockstack_client.utils.url_to_host_port( dest_hostport )
if port in atlas_nodes:
# connections to the above nodes will always fail, since they're NAT'ed
return 1.0

View File

@@ -98,9 +98,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[3].privkey, wallets[2].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[3].privkey, wallets[2].addr, value_hash='1a' * 20)
testlib.blockstack_name_register( "foo2.test", wallets[3].privkey, wallets[2].addr, value_hash='2a' * 20)
testlib.blockstack_name_register( "foo3.test", wallets[3].privkey, wallets[2].addr, value_hash='3a' * 20)
testlib.blockstack_name_register( "foo1.test", wallets[3].privkey, wallets[2].addr, zonefile_hash='1a' * 20)
testlib.blockstack_name_register( "foo2.test", wallets[3].privkey, wallets[2].addr, zonefile_hash='2a' * 20)
testlib.blockstack_name_register( "foo3.test", wallets[3].privkey, wallets[2].addr, zonefile_hash='3a' * 20)
testlib.next_block( **kw )
# whois

View File

@@ -106,7 +106,7 @@ def scenario( wallets, **kw ):
# renew/update
resp = testlib.blockstack_name_renew( "foo.test", wallets[4].privkey, value_hash='11' * 20 )
resp = testlib.blockstack_name_renew( "foo.test", wallets[4].privkey, zonefile_hash='11' * 20 )
if 'error' in resp:
print json.dumps( resp, indent=4 )
return False
@@ -152,7 +152,7 @@ def scenario( wallets, **kw ):
# renew/update/transfer
resp = testlib.blockstack_name_renew( "foo.test", wallets[1].privkey, value_hash='22' * 20, recipient_addr=wallets[0].addr )
resp = testlib.blockstack_name_renew( "foo.test", wallets[1].privkey, zonefile_hash='22' * 20, recipient_addr=wallets[0].addr )
if 'error' in resp:
print json.dumps( resp, indent=4 )

View File

@@ -58,9 +58,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[2].privkey, wallets[3].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, value_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, value_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, value_hash='33' * 20 )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='33' * 20 )
testlib.next_block( **kw )
# whois

View File

@@ -60,9 +60,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[2].privkey, wallets[3].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, value_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, value_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, value_hash='33' * 20 )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='33' * 20 )
testlib.next_block( **kw )
# whois
@@ -94,9 +94,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[3].privkey, wallets[2].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[3].privkey, wallets[2].addr, value_hash='1a' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[3].privkey, wallets[2].addr, value_hash='2a' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[3].privkey, wallets[2].addr, value_hash='3a' * 20 )
testlib.blockstack_name_register( "foo1.test", wallets[3].privkey, wallets[2].addr, zonefile_hash='1a' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[3].privkey, wallets[2].addr, zonefile_hash='2a' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[3].privkey, wallets[2].addr, zonefile_hash='3a' * 20 )
testlib.next_block( **kw )
# whois

View File

@@ -59,9 +59,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[2].privkey, wallets[3].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, value_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, value_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, value_hash='33' * 20 )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='33' * 20 )
testlib.next_block( **kw )
# whois
@@ -85,7 +85,7 @@ def scenario( wallets, **kw ):
for i in xrange(1, 4):
name = 'foo{}.test'.format(i)
resp = testlib.blockstack_name_renew( name, wallets[3].privkey, value_hash='{}a'.format(i) * 20, recipient_addr=wallets[0].addr )
resp = testlib.blockstack_name_renew( name, wallets[3].privkey, zonefile_hash='{}a'.format(i) * 20, recipient_addr=wallets[0].addr )
if 'error' in resp:
print resp
return False

View File

@@ -58,9 +58,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[2].privkey, wallets[3].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, value_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, value_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, value_hash='33' * 20 )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='33' * 20 )
testlib.next_block( **kw )
# whois

View File

@@ -58,9 +58,9 @@ def scenario( wallets, **kw ):
testlib.blockstack_name_preorder( "foo3.test", wallets[2].privkey, wallets[3].addr )
testlib.next_block( **kw )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, value_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, value_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, value_hash='33' * 20 )
testlib.blockstack_name_register( "foo1.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='11' * 20 )
testlib.blockstack_name_register( "foo2.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='22' * 20 )
testlib.blockstack_name_register( "foo3.test", wallets[2].privkey, wallets[3].addr, zonefile_hash='33' * 20 )
testlib.next_block( **kw )
# whois