wait only 10 blocks between operations; make sure we use the right address

This commit is contained in:
Jude Nelson
2017-11-10 18:40:45 -05:00
parent 1d3224fb91
commit 476005b278
6 changed files with 21 additions and 17 deletions

View File

@@ -250,7 +250,7 @@ def scenario( wallets, **kw ):
return False
# wait for the preorder to get confirmed
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
# wait for register to go through
@@ -265,7 +265,7 @@ def scenario( wallets, **kw ):
if not res:
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for update to be submitted'
@@ -279,7 +279,7 @@ def scenario( wallets, **kw ):
if not res:
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for transfer to be submitted'
@@ -293,7 +293,7 @@ def scenario( wallets, **kw ):
if not res:
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for transfer to be confirmed'

View File

@@ -56,7 +56,8 @@ index_file_data = "<html><head></head><body>foo.test hello world</body></html>"
resource_data = "hello world"
new_key = "cPo24qGYz76xSbUCug6e8LzmzLGJPZoowQC7fCVPLN2tzCUJgfcW"
new_addr = "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
new_addr = virtualchain.get_privkey_address(new_key)
# "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
insanity_key = "cSCyE5Q1AFVyDAL8LkHo1sFMVqmwdvFcCbGJ71xEvto2Nrtzjm67"

View File

@@ -56,7 +56,8 @@ index_file_data = "<html><head></head><body>foo.test hello world</body></html>"
resource_data = "hello world"
new_key = "cPo24qGYz76xSbUCug6e8LzmzLGJPZoowQC7fCVPLN2tzCUJgfcW"
new_addr = "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
new_addr = virtualchain.get_privkey_address(new_key)
# "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
insanity_key = "cSCyE5Q1AFVyDAL8LkHo1sFMVqmwdvFcCbGJ71xEvto2Nrtzjm67"
@@ -140,6 +141,7 @@ def scenario( wallets, **kw ):
res = testlib.blockstack_REST_call('PUT', '/v1/wallet/keys/owner', None, api_pass=api_pass,
data=new_key)
if res['http_status'] != 200 or 'error' in res:
print 'failed to set owner key'
print res

View File

@@ -55,7 +55,8 @@ index_file_data = "<html><head></head><body>foo.test hello world</body></html>"
resource_data = "hello world"
owner_key = "cPo24qGYz76xSbUCug6e8LzmzLGJPZoowQC7fCVPLN2tzCUJgfcW"
owner_addr = "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
owner_addr = virtualchain.get_privkey_hex(owner_key)
# "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
payment_key = wallets[1].privkey

View File

@@ -56,7 +56,7 @@ index_file_data = "<html><head></head><body>foo.test hello world</body></html>"
resource_data = "hello world"
new_key = "cPo24qGYz76xSbUCug6e8LzmzLGJPZoowQC7fCVPLN2tzCUJgfcW"
new_addr = "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
new_addr = virtualchain.get_privkey_address(new_key) # "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
insanity_key = "cSCyE5Q1AFVyDAL8LkHo1sFMVqmwdvFcCbGJ71xEvto2Nrtzjm67"
@@ -132,7 +132,7 @@ def scenario( wallets, **kw ):
return False
# wait for the preorder to get confirmed
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
# wait for register to go through
@@ -147,7 +147,7 @@ def scenario( wallets, **kw ):
if not res:
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for update to be submitted'
@@ -163,7 +163,7 @@ def scenario( wallets, **kw ):
print "update error in first update"
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for transfer to be submitted'
@@ -280,7 +280,7 @@ def scenario( wallets, **kw ):
print res
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
# wait for zonefile to propagate

View File

@@ -56,7 +56,7 @@ index_file_data = "<html><head></head><body>foo.test hello world</body></html>"
resource_data = "hello world"
new_key = "cPo24qGYz76xSbUCug6e8LzmzLGJPZoowQC7fCVPLN2tzCUJgfcW"
new_addr = "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
new_addr = virtualchain.get_privkey_address(new_key) # "mqnupoveYRrSHmrxFT9nQQEZt3RLsetbBQ"
insanity_key = "cSCyE5Q1AFVyDAL8LkHo1sFMVqmwdvFcCbGJ71xEvto2Nrtzjm67"
@@ -152,7 +152,7 @@ def scenario( wallets, **kw ):
if not res:
return False
# wait for the preorder to get confirmed
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
# wait for register to go through
print 'Wait for register to be submitted'
@@ -166,7 +166,7 @@ def scenario( wallets, **kw ):
if not res:
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for update to be submitted'
@@ -182,7 +182,7 @@ def scenario( wallets, **kw ):
print "update error in first update"
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
print 'Wait for zonefile to be sent'
@@ -268,7 +268,7 @@ def scenario( wallets, **kw ):
print res
return False
for i in xrange(0, 6):
for i in xrange(0, 4):
testlib.next_block( **kw )
# wait for zonefile to propagate