Skip to content

Commit f87d9f6

Browse files
0xFirekeeper0xFirekeeper
authored
The Great Refactor (#164)
1 parent 0e367ce commit f87d9f6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+357
-592
lines changed

‎Assets/Tests/CustomReadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public IEnumerator GetContract_Success()
4141
{
4242
var contract = ThirdwebManager.Instance.SDK.GetContract("0x");
4343
Assert.IsNotNull(contract);
44-
Assert.AreEqual("0x", contract.address);
44+
Assert.AreEqual("0x", contract.Address);
4545
yield return null;
4646
}
4747

‎Assets/Tests/ERC1155ReadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public IEnumerator GetContract_Success()
3939
{
4040
var contract = ThirdwebManager.Instance.SDK.GetContract(_dropErc1155Address);
4141
Assert.IsNotNull(contract);
42-
Assert.AreEqual(_dropErc1155Address, contract.address);
42+
Assert.AreEqual(_dropErc1155Address, contract.Address);
4343
yield return null;
4444
}
4545

‎Assets/Tests/ERC1155WriteTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private IEnumerator ConnectSmartWallet()
4040
{
4141
Utils.DeleteLocalAccount();
4242
var connection = new WalletConnection(provider: WalletProvider.SmartWallet, chainId: 421614, personalWallet: WalletProvider.LocalWallet);
43-
var connectTask = ThirdwebManager.Instance.SDK.wallet.Connect(connection);
43+
var connectTask = ThirdwebManager.Instance.SDK.Wallet.Connect(connection);
4444
yield return new WaitUntil(() => connectTask.IsCompleted);
4545
if (connectTask.IsFaulted)
4646
throw connectTask.Exception;
@@ -82,7 +82,7 @@ public IEnumerator ERC1155_Transfer_Success()
8282
{
8383
yield return ERC1155_Claim_Success();
8484

85-
var addressTask = ThirdwebManager.Instance.SDK.wallet.GetAddress();
85+
var addressTask = ThirdwebManager.Instance.SDK.Wallet.GetAddress();
8686
yield return new WaitUntil(() => addressTask.IsCompleted);
8787
if (addressTask.IsFaulted)
8888
throw addressTask.Exception;

‎Assets/Tests/ERC20ReadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public IEnumerator GetContract_Success()
3939
{
4040
var contract = ThirdwebManager.Instance.SDK.GetContract(_dropErc20Address);
4141
Assert.IsNotNull(contract);
42-
Assert.AreEqual(_dropErc20Address, contract.address);
42+
Assert.AreEqual(_dropErc20Address, contract.Address);
4343
yield return null;
4444
}
4545

‎Assets/Tests/ERC20WriteTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private IEnumerator ConnectSmartWallet()
4040
{
4141
Utils.DeleteLocalAccount();
4242
var connection = new WalletConnection(provider: WalletProvider.SmartWallet, chainId: 421614, personalWallet: WalletProvider.LocalWallet);
43-
var connectTask = ThirdwebManager.Instance.SDK.wallet.Connect(connection);
43+
var connectTask = ThirdwebManager.Instance.SDK.Wallet.Connect(connection);
4444
yield return new WaitUntil(() => connectTask.IsCompleted);
4545
if (connectTask.IsFaulted)
4646
throw connectTask.Exception;

‎Assets/Tests/ERC721ReadTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public IEnumerator GetContract_Success()
3939
{
4040
var contract = ThirdwebManager.Instance.SDK.GetContract(_dropErc721Address);
4141
Assert.IsNotNull(contract);
42-
Assert.AreEqual(_dropErc721Address, contract.address);
42+
Assert.AreEqual(_dropErc721Address, contract.Address);
4343
yield return null;
4444
}
4545

‎Assets/Tests/ERC721WriteTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private IEnumerator ConnectSmartWallet()
4040
{
4141
Utils.DeleteLocalAccount();
4242
var connection = new WalletConnection(provider: WalletProvider.SmartWallet, chainId: 421614, personalWallet: WalletProvider.LocalWallet);
43-
var connectTask = ThirdwebManager.Instance.SDK.wallet.Connect(connection);
43+
var connectTask = ThirdwebManager.Instance.SDK.Wallet.Connect(connection);
4444
yield return new WaitUntil(() => connectTask.IsCompleted);
4545
if (connectTask.IsFaulted)
4646
throw connectTask.Exception;

‎Assets/Tests/EventsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public IEnumerator GetEventLogs_Success()
6161
var contract = ThirdwebManager.Instance.SDK.GetContract(_dropErc721Address);
6262
if (Utils.IsWebGLBuild())
6363
{
64-
var transferEvents = contract.events.Get<TransferEvent>("Transfer");
64+
var transferEvents = contract.Events.Get<TransferEvent>("Transfer");
6565
yield return new WaitUntil(() => transferEvents.IsCompleted);
6666
if (transferEvents.IsFaulted)
6767
throw transferEvents.Exception;

‎Assets/Tests/MarketplaceReadTests.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ public IEnumerator GetContract_Success()
3939
{
4040
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
4141
Assert.IsNotNull(contract);
42-
Assert.AreEqual(_marketplaceAddress, contract.address);
42+
Assert.AreEqual(_marketplaceAddress, contract.Address);
4343
yield return null;
4444
}
4545

4646
[UnityTest]
4747
public IEnumerator DirectListings_GetAll_Success()
4848
{
4949
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
50-
var result = contract.marketplace.directListings.GetAll();
50+
var result = contract.Marketplace.DirectListings.GetAll();
5151
yield return new WaitUntil(() => result.IsCompleted);
5252
Assert.IsTrue(result.IsCompletedSuccessfully);
5353
Assert.IsNotNull(result.Result);
@@ -59,7 +59,7 @@ public IEnumerator DirectListings_GetAll_Success()
5959
public IEnumerator DirectListings_GetAllValid_Success()
6060
{
6161
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
62-
var result = contract.marketplace.directListings.GetAllValid();
62+
var result = contract.Marketplace.DirectListings.GetAllValid();
6363
yield return new WaitUntil(() => result.IsCompleted);
6464
Assert.IsTrue(result.IsCompletedSuccessfully);
6565
Assert.IsNotNull(result.Result);
@@ -71,7 +71,7 @@ public IEnumerator DirectListings_GetAllValid_Success()
7171
public IEnumerator DirectListings_GetListing_Success()
7272
{
7373
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
74-
var result = contract.marketplace.directListings.GetListing("1");
74+
var result = contract.Marketplace.DirectListings.GetListing("1");
7575
yield return new WaitUntil(() => result.IsCompleted);
7676
Assert.IsTrue(result.IsCompletedSuccessfully);
7777
Assert.IsNotNull(result.Result);
@@ -82,7 +82,7 @@ public IEnumerator DirectListings_GetListing_Success()
8282
public IEnumerator DirectListings_GetTotalCount_Success()
8383
{
8484
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
85-
var result = contract.marketplace.directListings.GetTotalCount();
85+
var result = contract.Marketplace.DirectListings.GetTotalCount();
8686
yield return new WaitUntil(() => result.IsCompleted);
8787
Assert.IsTrue(result.IsCompletedSuccessfully);
8888
Assert.IsNotNull(result.Result);
@@ -94,7 +94,7 @@ public IEnumerator DirectListings_GetTotalCount_Success()
9494
public IEnumerator DirectListings_IsBuyerApprovedForListing_Success()
9595
{
9696
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
97-
var result = contract.marketplace.directListings.IsBuyerApprovedForListing("1", _marketplaceAddress);
97+
var result = contract.Marketplace.DirectListings.IsBuyerApprovedForListing("1", _marketplaceAddress);
9898
yield return new WaitUntil(() => result.IsCompleted);
9999
if (Utils.IsWebGLBuild())
100100
{
@@ -112,7 +112,7 @@ public IEnumerator DirectListings_IsBuyerApprovedForListing_Success()
112112
public IEnumerator DirectListings_IsCurrencyApprovedForListing_Success()
113113
{
114114
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
115-
var result = contract.marketplace.directListings.IsCurrencyApprovedForListing("1", _marketplaceAddress);
115+
var result = contract.Marketplace.DirectListings.IsCurrencyApprovedForListing("1", _marketplaceAddress);
116116
yield return new WaitUntil(() => result.IsCompleted);
117117
Assert.IsTrue(result.IsCompletedSuccessfully);
118118
Assert.IsNotNull(result.Result);
@@ -123,7 +123,7 @@ public IEnumerator DirectListings_IsCurrencyApprovedForListing_Success()
123123
public IEnumerator EnglishAuctions_GetAll_Success()
124124
{
125125
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
126-
var result = contract.marketplace.englishAuctions.GetAll();
126+
var result = contract.Marketplace.EnglishAuctions.GetAll();
127127
yield return new WaitUntil(() => result.IsCompleted);
128128
Assert.IsTrue(result.IsCompletedSuccessfully);
129129
Assert.IsNotNull(result.Result);
@@ -135,7 +135,7 @@ public IEnumerator EnglishAuctions_GetAll_Success()
135135
public IEnumerator EnglishAuctions_GetAllValid_Success()
136136
{
137137
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
138-
var result = contract.marketplace.englishAuctions.GetAllValid();
138+
var result = contract.Marketplace.EnglishAuctions.GetAllValid();
139139
yield return new WaitUntil(() => result.IsCompleted);
140140
Assert.IsTrue(result.IsCompletedSuccessfully);
141141
Assert.IsNotNull(result.Result);
@@ -147,7 +147,7 @@ public IEnumerator EnglishAuctions_GetAllValid_Success()
147147
public IEnumerator EnglishAuctions_GetAuction_Success()
148148
{
149149
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
150-
var result = contract.marketplace.englishAuctions.GetAuction("0");
150+
var result = contract.Marketplace.EnglishAuctions.GetAuction("0");
151151
yield return new WaitUntil(() => result.IsCompleted);
152152
Assert.IsTrue(result.IsCompletedSuccessfully);
153153
Assert.IsNotNull(result.Result);
@@ -158,7 +158,7 @@ public IEnumerator EnglishAuctions_GetAuction_Success()
158158
public IEnumerator EnglishAuctions_GetBidBufferBps_Success()
159159
{
160160
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
161-
var result = contract.marketplace.englishAuctions.GetBidBufferBps("0");
161+
var result = contract.Marketplace.EnglishAuctions.GetBidBufferBps("0");
162162
yield return new WaitUntil(() => result.IsCompleted);
163163
Assert.IsTrue(result.IsCompletedSuccessfully);
164164
Assert.IsNotNull(result.Result);
@@ -169,7 +169,7 @@ public IEnumerator EnglishAuctions_GetBidBufferBps_Success()
169169
public IEnumerator EnglishAuctions_GetMinimumNextBid_Success()
170170
{
171171
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
172-
var result = contract.marketplace.englishAuctions.GetMinimumNextBid("0");
172+
var result = contract.Marketplace.EnglishAuctions.GetMinimumNextBid("0");
173173
yield return new WaitUntil(() => result.IsCompleted);
174174
Assert.IsTrue(result.IsCompletedSuccessfully);
175175
Assert.IsNotNull(result.Result);
@@ -180,7 +180,7 @@ public IEnumerator EnglishAuctions_GetMinimumNextBid_Success()
180180
public IEnumerator EnglishAuctions_GetTotalCount_Success()
181181
{
182182
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
183-
var result = contract.marketplace.englishAuctions.GetTotalCount();
183+
var result = contract.Marketplace.EnglishAuctions.GetTotalCount();
184184
yield return new WaitUntil(() => result.IsCompleted);
185185
if (result.IsFaulted)
186186
throw result.Exception;
@@ -194,7 +194,7 @@ public IEnumerator EnglishAuctions_GetTotalCount_Success()
194194
public IEnumerator EnglishAuctions_GetWinner_Success()
195195
{
196196
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
197-
var result = contract.marketplace.englishAuctions.GetWinner("0");
197+
var result = contract.Marketplace.EnglishAuctions.GetWinner("0");
198198
yield return new WaitUntil(() => result.IsCompleted);
199199
if (Utils.IsWebGLBuild())
200200
{
@@ -214,7 +214,7 @@ public IEnumerator EnglishAuctions_GetWinner_Success()
214214
public IEnumerator EnglishAuctions_GetWinningBid_Success()
215215
{
216216
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
217-
var result = contract.marketplace.englishAuctions.GetWinningBid("0");
217+
var result = contract.Marketplace.EnglishAuctions.GetWinningBid("0");
218218
yield return new WaitUntil(() => result.IsCompleted);
219219
if (result.IsFaulted)
220220
throw result.Exception;
@@ -227,7 +227,7 @@ public IEnumerator EnglishAuctions_GetWinningBid_Success()
227227
public IEnumerator EnglishAuctions_IsWinningBid_Success()
228228
{
229229
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
230-
var result = contract.marketplace.englishAuctions.IsWinningBid("0", "1");
230+
var result = contract.Marketplace.EnglishAuctions.IsWinningBid("0", "1");
231231
yield return new WaitUntil(() => result.IsCompleted);
232232
if (result.IsFaulted)
233233
throw result.Exception;
@@ -240,7 +240,7 @@ public IEnumerator EnglishAuctions_IsWinningBid_Success()
240240
public IEnumerator Offers_GetAll_Success()
241241
{
242242
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
243-
var result = contract.marketplace.offers.GetAll();
243+
var result = contract.Marketplace.Offers.GetAll();
244244
yield return new WaitUntil(() => result.IsCompleted);
245245
if (result.IsFaulted)
246246
throw result.Exception;
@@ -254,7 +254,7 @@ public IEnumerator Offers_GetAll_Success()
254254
public IEnumerator Offers_GetAllValid_Success()
255255
{
256256
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
257-
var result = contract.marketplace.offers.GetAllValid();
257+
var result = contract.Marketplace.Offers.GetAllValid();
258258
yield return new WaitUntil(() => result.IsCompleted);
259259
if (result.IsFaulted)
260260
throw result.Exception;
@@ -268,7 +268,7 @@ public IEnumerator Offers_GetAllValid_Success()
268268
public IEnumerator Offers_GetOffer_Success()
269269
{
270270
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
271-
var result = contract.marketplace.offers.GetOffer("0");
271+
var result = contract.Marketplace.Offers.GetOffer("0");
272272
yield return new WaitUntil(() => result.IsCompleted);
273273
if (result.IsFaulted)
274274
throw result.Exception;
@@ -281,7 +281,7 @@ public IEnumerator Offers_GetOffer_Success()
281281
public IEnumerator Offers_GetTotalCount_Success()
282282
{
283283
var contract = ThirdwebManager.Instance.SDK.GetContract(_marketplaceAddress);
284-
var result = contract.marketplace.offers.GetTotalCount();
284+
var result = contract.Marketplace.Offers.GetTotalCount();
285285
yield return new WaitUntil(() => result.IsCompleted);
286286
if (result.IsFaulted)
287287
throw result.Exception;

‎Assets/Tests/PackReadTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void TearDown()
3838
public IEnumerator Get_Success()
3939
{
4040
var contract = ThirdwebManager.Instance.SDK.GetContract(_packAddress);
41-
var packTask = contract.pack.Get("0");
41+
var packTask = contract.Pack.Get("0");
4242
yield return new WaitUntil(() => packTask.IsCompleted);
4343
Assert.IsTrue(packTask.IsCompletedSuccessfully);
4444
Assert.IsNotNull(packTask.Result);
@@ -48,7 +48,7 @@ public IEnumerator Get_Success()
4848
public IEnumerator BalanceOf_Success()
4949
{
5050
var contract = ThirdwebManager.Instance.SDK.GetContract(_packAddress);
51-
var packTask = contract.pack.BalanceOf(_packAddress, "0");
51+
var packTask = contract.Pack.BalanceOf(_packAddress, "0");
5252
yield return new WaitUntil(() => packTask.IsCompleted);
5353
Assert.IsTrue(packTask.IsCompletedSuccessfully);
5454
Assert.IsNotNull(packTask.Result);
@@ -58,7 +58,7 @@ public IEnumerator BalanceOf_Success()
5858
public IEnumerator IsApprovedForAll_Success()
5959
{
6060
var contract = ThirdwebManager.Instance.SDK.GetContract(_packAddress);
61-
var packTask = contract.pack.IsApprovedForAll(_packAddress, _packAddress);
61+
var packTask = contract.Pack.IsApprovedForAll(_packAddress, _packAddress);
6262
yield return new WaitUntil(() => packTask.IsCompleted);
6363
Assert.IsTrue(packTask.IsCompletedSuccessfully);
6464
Assert.IsNotNull(packTask.Result);
@@ -68,7 +68,7 @@ public IEnumerator IsApprovedForAll_Success()
6868
public IEnumerator TotalSupply_Success()
6969
{
7070
var contract = ThirdwebManager.Instance.SDK.GetContract(_packAddress);
71-
var packTask = contract.pack.TotalSupply("0");
71+
var packTask = contract.Pack.TotalSupply("0");
7272
yield return new WaitUntil(() => packTask.IsCompleted);
7373
Assert.IsTrue(packTask.IsCompletedSuccessfully);
7474
Assert.IsNotNull(packTask.Result);
@@ -79,7 +79,7 @@ public IEnumerator TotalSupply_Success()
7979
public IEnumerator GetPackContents_Success()
8080
{
8181
var contract = ThirdwebManager.Instance.SDK.GetContract(_packAddress);
82-
var packTask = contract.pack.GetPackContents("0");
82+
var packTask = contract.Pack.GetPackContents("0");
8383
yield return new WaitUntil(() => packTask.IsCompleted);
8484
Assert.IsTrue(packTask.IsCompletedSuccessfully);
8585
Assert.IsNotNull(packTask.Result);

0 commit comments

Comments
 (0)