Skip to content

Commit

Permalink
Merge pull request #1338 from Pylons-tech/working_branch_cleanup
Browse files Browse the repository at this point in the history
Working branch cleanup
  • Loading branch information
afti-githobo committed Nov 3, 2022
2 parents d28f205 + 862823f commit 1ed2389
Show file tree
Hide file tree
Showing 39 changed files with 26 additions and 1,776 deletions.
2 changes: 1 addition & 1 deletion dart_sdk/example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';
import 'package:fixnum/fixnum.dart';

void main() {
Expand Down
5 changes: 4 additions & 1 deletion dart_sdk/lib/low_level.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export 'src/core/error/exceptions.dart';
export 'src/pylons_wallet.dart';
export 'src/generated/cosmos/base/v1beta1/coin.pb.dart' show Coin;
export 'src/generated/cosmos/tx/v1beta1/tx.pb.dart';
export 'src/generated/pylons/cookbook.pb.dart';
Expand All @@ -7,4 +9,5 @@ export 'src/generated/pylons/execution.pb.dart';
export 'src/generated/pylons/trade.pb.dart';
export 'src/generated/pylons/tx.pb.dart';
export 'src/features/models/sdk_ipc_response.dart';
export 'src/features/data/models/profile.dart' show Profile;
export 'src/features/data/models/profile.dart' show Profile;
export 'src/features/helper/dec_string.dart';
2 changes: 0 additions & 2 deletions dart_sdk/lib/src/types/recipe.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import '../../pylons_sdk.dart';
import '../generated/pylons/item.pb.dart' as generated;
import '../generated/pylons/payment_info.pb.dart' as generated;
import '../generated/pylons/recipe.pb.dart' as generated;
import 'item.dart';
import 'execution.dart';

const _PRECISION = 10;

Expand Down
14 changes: 8 additions & 6 deletions dart_sdk/lib/src/types/trade.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import '../generated/pylons/trade.pb.dart' as generated;
// todo: write this

class Trade {
final generated.Trade _native;

Trade(this._native);
}
// import '../generated/pylons/trade.pb.dart' as generated;
//
// class Trade {
// final generated.Trade _native;
//
// Trade(this._native);
// }
2 changes: 1 addition & 1 deletion dart_sdk/test/mocks/mockedWallet.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:mockito/mockito.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';

class MockWallet extends Mock implements PylonsWallet {
List<Cookbook> cookbooks = [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart' as ll;
import 'package:pylons_sdk/src/core/constants/strings.dart';
import 'package:pylons_sdk/src/features/ipc/handlers/get_trades_handler.dart';
Expand All @@ -10,7 +9,7 @@ import '../../../../mocks/mock_constants.dart';
void main() {
test('should complete the get trades future', () {
initResponseCompleter(Strings.GET_TRADES);
var sdkResponse = SDKIPCResponse(
var sdkResponse = ll.SDKIPCResponse(
success: false, error: '', data: '', errorCode: '', action: '');
var handler = GetTradesHandler();
handler.handler(sdkResponse);
Expand All @@ -19,7 +18,7 @@ void main() {

test('should complete the get trades future with data ', () async {
initResponseCompleter(Strings.GET_TRADES);
var sdkResponse = SDKIPCResponse(
var sdkResponse = ll.SDKIPCResponse(
success: true,
error: '',
data: [MOCK_TRADE.toProto3Json()],
Expand All @@ -34,13 +33,13 @@ void main() {

var response = await responseCompleters[Strings.GET_TRADES]!.future;
expect(true, response.success);
expect(true, response.data is List<Trade>);
expect(1, List<Trade>.from(response.data).length);
expect(true, response.data is List<ll.Trade>);
expect(1, List<ll.Trade>.from(response.data).length);
});

test('should complete the get trades future with error ', () async {
initResponseCompleter(Strings.GET_TRADES);
var sdkResponse = SDKIPCResponse(
var sdkResponse = ll.SDKIPCResponse(
success: true,
error: '',
data: [
Expand Down
2 changes: 1 addition & 1 deletion easel/lib/easel_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import 'package:flutter/services.dart';
import 'package:get_it/get_it.dart';
import 'package:just_audio/just_audio.dart';
import 'package:media_info/media_info.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';
import 'package:share_plus/share_plus.dart';
import 'package:video_player/video_player.dart';

Expand Down
2 changes: 1 addition & 1 deletion easel/lib/models/nft.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:easel_flutter/utils/constants.dart';
import 'package:easel_flutter/utils/extension_util.dart';
import 'package:equatable/equatable.dart';
import 'package:floor/floor.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';

import '../utils/enums.dart';

Expand Down
2 changes: 1 addition & 1 deletion easel/lib/repository/repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import 'package:easel_flutter/utils/extension_util.dart';
import 'package:easel_flutter/utils/failure/failure.dart';
import 'package:easel_flutter/utils/file_utils_helper.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';

import '../generated/locale_keys.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion easel/lib/screens/creator_hub/creator_hub_view_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:easel_flutter/utils/extension_util.dart';
import 'package:easel_flutter/widgets/loading.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';

import '../../generated/locale_keys.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion easel/lib/services/datasources/remote_datasource.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:easel_flutter/models/storage_response_model.dart';
import 'package:easel_flutter/models/upload_progress.dart';
import 'package:easel_flutter/services/third_party_services/analytics_helper.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';

import '../../generated/locale_keys.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion easel/lib/utils/extension_util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:easel_flutter/utils/enums.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:path/path.dart' as path;
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';


extension ScaffoldHelper on BuildContext? {
Expand Down
2 changes: 1 addition & 1 deletion easel/test/mock/mock_repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:easel_flutter/models/picked_file_model.dart';
import 'package:easel_flutter/models/save_nft.dart';
import 'package:easel_flutter/repository/repository.dart';
import 'package:easel_flutter/utils/failure/failure.dart';
import 'package:pylons_sdk/pylons_sdk.dart';
import 'package:pylons_sdk/low_level.dart';

import 'mock_constants.dart';

Expand Down
47 changes: 0 additions & 47 deletions stubwallet/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions stubwallet/.metadata

This file was deleted.

16 changes: 0 additions & 16 deletions stubwallet/README.md

This file was deleted.

29 changes: 0 additions & 29 deletions stubwallet/analysis_options.yaml

This file was deleted.

Loading

0 comments on commit 1ed2389

Please sign in to comment.