Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Revert "finished switch from using hash # in URLs to colon :"

Browse source 
This reverts commit 888aa558
This commit is contained in:
Jack Robison 2021-05-07 11:31:28 -04:00
parent 2ca5a65544
commit b5dfce7861
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbry/wallet/server/db/writer.py
View file

@ -47,8 +47,8 @@ class SQLDB:
expiration_height integer not null, expiration_height integer not null,
release_time integer not null, release_time integer not null,
short_url text not null, -- normalized:shortest-unique-claim_id short_url text not null, -- normalized#shortest-unique-claim_id
canonical_url text, -- channel's-short_url/normalized:shortest-unique-claim_id-within-channel canonical_url text, -- channel's-short_url/normalized#shortest-unique-claim_id-within-channel
title text, title text,
author text, author text,
@ -453,7 +453,7 @@ class SQLDB:
CASE WHEN :height >= 137181 THEN :height+2102400 ELSE :height+262974 END, CASE WHEN :height >= 137181 THEN :height+2102400 ELSE :height+262974 END,
:claim_name||COALESCE( :claim_name||COALESCE(
(SELECT shortest_id(claim_id, :claim_id) FROM claim WHERE normalized = :normalized), (SELECT shortest_id(claim_id, :claim_id) FROM claim WHERE normalized = :normalized),
':'||substr(:claim_id, 1, 1) '#'||substr(:claim_id, 1, 1)
) )
)""", claims) )""", claims)
@ -666,7 +666,7 @@ class SQLDB:
WHERE other_claim.signature_valid = 1 AND WHERE other_claim.signature_valid = 1 AND
other_claim.channel_hash = :channel_hash AND other_claim.channel_hash = :channel_hash AND
other_claim.normalized = claim.normalized), other_claim.normalized = claim.normalized),
':'||substr(claim_id, 1, 1) '#'||substr(claim_id, 1, 1)
) )
END END
WHERE claim_hash=:claim_hash; WHERE claim_hash=:claim_hash;

2
lbry/wallet/transaction.py
View file

@ -384,7 +384,7 @@ class Output(InputOutput):
@property @property
def permanent_url(self) -> str: def permanent_url(self) -> str:
if self.script.is_claim_involved: if self.script.is_claim_involved:
return f"lbry://{self.claim_name}:{self.claim_id}" return f"lbry://{self.claim_name}#{self.claim_id}"
raise ValueError('No claim associated.') raise ValueError('No claim associated.')
@property @property

4
tests/integration/blockchain/test_claim_commands.py
View file

@ -160,11 +160,11 @@ class ClaimSearchCommand(ClaimTestCase):
# three streams in channel, zero streams in abandoned channel # three streams in channel, zero streams in abandoned channel
claims = [three, two, signed] claims = [three, two, signed]
await self.assertFindsClaims(claims, channel_ids=[self.channel_id]) await self.assertFindsClaims(claims, channel_ids=[self.channel_id])
await self.assertFindsClaims(claims, channel=f"@abc:{self.channel_id}") await self.assertFindsClaims(claims, channel=f"@abc#{self.channel_id}")
await self.assertFindsClaims([], channel=f"@inexistent") await self.assertFindsClaims([], channel=f"@inexistent")
await self.assertFindsClaims([three, two, signed2, signed], channel_ids=[channel_id2, self.channel_id]) await self.assertFindsClaims([three, two, signed2, signed], channel_ids=[channel_id2, self.channel_id])
await self.channel_abandon(claim_id=self.channel_id) await self.channel_abandon(claim_id=self.channel_id)
await self.assertFindsClaims([], channel=f"@abc:{self.channel_id}", valid_channel_signature=True) await self.assertFindsClaims([], channel=f"@abc#{self.channel_id}", valid_channel_signature=True)
await self.assertFindsClaims([], channel_ids=[self.channel_id], valid_channel_signature=True) await self.assertFindsClaims([], channel_ids=[self.channel_id], valid_channel_signature=True)
await self.assertFindsClaims([signed2], channel_ids=[channel_id2], valid_channel_signature=True) await self.assertFindsClaims([signed2], channel_ids=[channel_id2], valid_channel_signature=True)
# pass `invalid_channel_signature=False` to catch a bug in argument processing # pass `invalid_channel_signature=False` to catch a bug in argument processing

6
tests/integration/blockchain/test_resolve_command.py
View file

@ -132,8 +132,8 @@ class ResolveCommand(BaseResolveTestCase):
channel_id = self.get_claim_id( channel_id = self.get_claim_id(
await self.channel_create('@abc', '1.1', allow_duplicate_name=True)) await self.channel_create('@abc', '1.1', allow_duplicate_name=True))
await self.assertResolvesToClaimId(f'@abc', channel_id) await self.assertResolvesToClaimId(f'@abc', channel_id)
await self.assertResolvesToClaimId(f'@abc:{channel_id[:10]}', channel_id) await self.assertResolvesToClaimId(f'@abc#{channel_id[:10]}', channel_id)
await self.assertResolvesToClaimId(f'@abc:{channel_id}', channel_id) await self.assertResolvesToClaimId(f'@abc#{channel_id}', channel_id)
channel = (await self.claim_search(claim_id=channel_id))[0] channel = (await self.claim_search(claim_id=channel_id))[0]
await self.assertResolvesToClaimId(channel['short_url'], channel_id) await self.assertResolvesToClaimId(channel['short_url'], channel_id)
await self.assertResolvesToClaimId(channel['canonical_url'], channel_id) await self.assertResolvesToClaimId(channel['canonical_url'], channel_id)
@ -182,7 +182,7 @@ class ResolveCommand(BaseResolveTestCase):
response = await self.resolve('lbry://on-channel-claim') response = await self.resolve('lbry://on-channel-claim')
self.assertFalse(response['is_channel_signature_valid']) self.assertFalse(response['is_channel_signature_valid'])
self.assertEqual({'channel_id': abandoned_channel_id}, response['signing_channel']) self.assertEqual({'channel_id': abandoned_channel_id}, response['signing_channel'])
direct_uri = 'lbry://on-channel-claim:' + orphan_claim_id direct_uri = 'lbry://on-channel-claim#' + orphan_claim_id
response = await self.resolve(direct_uri) response = await self.resolve(direct_uri)
self.assertFalse(response['is_channel_signature_valid']) self.assertFalse(response['is_channel_signature_valid'])
self.assertEqual({'channel_id': abandoned_channel_id}, response['signing_channel']) self.assertEqual({'channel_id': abandoned_channel_id}, response['signing_channel'])